am daaf7b11: Merge "Impl for supporting two video scaling modes" into jb-dev

* commit 'daaf7b119649674cfc414a8761585fed6b0296df':
  Impl for supporting two video scaling modes