Merge "Fix some NuPlayer issues."