Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-dev