Merge changes I68f6241c,Ib95b8df3 into main

* changes:
  Migrate LIGHT_REVEAL_MIGRATION to aconfig
  Migrate NEW_AOD_TRANSITION to aconfig