Merge "Add test for seamless rotation when launching app over keyguard" into main