Merge "NuPlayer: adjust temporal-layers to achieve smooth play" into nyc-mr1-dev