Merge "Don't kill PiP with obsolete call to updatePictureInPictureMode" into main