Merge "Make PiP round corners when entering from split screen." into tm-dev