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

Change-Id: I44dc761fde557fa49b178d208c0ae9474d65596b