Merge "NuPlayer: update timestamp handling" into lmp-dev