Merge "flake fix for "testOnScreenLock_closesMenu"" into main