Merge changes Ib464245c,I63650f76 into main

* changes:
  Ensure translationX gets reset
  Clean up newAodTranstion() flag