Merge changes I20bdab1b,Id82f9081 into oc-dev

* changes:
  Fix backwards flag causing crash.
  Fixing issue with PiP aspect ratio being clobbered.