Merge "Adjust assertions to match auto enter PiP" into main