Merge changes I6437a66f,I74016ae5,If44c2088 into main

* changes:
  Teamfood NEW_AOD_TRANSITION
  Teamfood LIGHT_REVEAL_MIGRATION
  Make AOD transitions more calm