Merge changes I2d9f1a2d,I01fd8ba6

* changes:
  Ensure PIP retains bounds on device rotation.
  Fix wrong bounds being used in landscape.