Merge "Ensure AOD ui reappears after ALTERNATE_BOUNCER" into main