Merge "Resolve race condition when requesting bouncer from AOD/dozing" into main