Merge "Add debugging information on PiP content overlay" into main