Merge "For fixed rotation test assert that PiP is within screen bounds" into main