Merge \\"Using requested video scaling mode in NuPlayer\\" am: 42cf4c39dc
am: f8f2f89cf1

Change-Id: I3c00f5086d3292aeb0a491f43623a1f38247efd7