Merge "Implement content overlay in PiP2" into main