Merge "Fixed glitch in NuPlayer when surface size changes"