Merge "NuPlayer: play out pending frames on discontinuity"