Merge changes I02f057bb,Ia640ead2 into rvc-dev

* changes:
  PIP resize: Set starting orientation correctly.
  Reset the scaling when finalizing resize.