Merge "NuPlayer: add support for proper stop" into lmp-dev