Merge "Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format change""