Merge "Using requested video scaling mode in NuPlayer" into nyc-mr1-dev