AC21 does not apply since you have yet filed I-485. On the other hand, it would be ok if USCIS is not aware of your position change prior to I-485.