Merge "Fix assertion for entering PiP from landscape split screen" into main