Merge "Fix testOnUserSwitching_UpdatesBrightness" into main