Merge "Various improvements to nuplayer playback"