Merge "NuPlayer: Fix failure to stop audio playback" into lmp-mr1-dev