am 8311aa4a: am 2879bb21: Merge "Explicitly set the video scaling mode to "stretch"." into jb-dev

* commit '8311aa4a6a33563232f9b94b43a5eb6482f369b9':
  Explicitly set the video scaling mode to "stretch".