Merge "Add video scaling mode support with a new public method in MediaPlayer.java class" into jb-dev