Merge "Cleanup LegacySplitScreen usage in PiP" into tm-dev