Merge "Add debugging information on PiP content overlay" into 24D1-dev