Merge "MediaPlayer2: keep EventCallbacks when reset"