Merge "Merge "Fix regressions in PiP movement bounds handling" into qt-dev am: 87ee4e1dc7 am: ad08acbfa8" into qt-r1-dev-plus-aosp