-Yes.
But I am confused that "Changed job last year, company A agreed to future GC when asking to take a leave." Do you mean Company A continue to sponsor your GC even if you do not work for him now? If so, you may need to ask Company A to file the appeal, or MTR/Reconsideration for the revoked I-140. If no, you do not need to file anything for the I-140, but only file the MTR/Reconsideration for your I-485 based on AC21. You need a letter from your current employer for the I-485 MTR indicating your job tilte, responsibilities, salary, permanent position.