Merge "Fix regressions in PiP movement bounds handling" into qt-dev am: 87ee4e1dc7
am: 9f3deb5294

Change-Id: Idfe37b6a8bf9f6a3d77b9fe04a7207789eadcf51