Merge "Explicitly set the video scaling mode to "stretch"." into jb-dev