Merge remote-tracking branch 'remotes/origin/BUG-2817-Canceling_a_playback_resume_dialog_adds_video_and_DVD_to_playlist'
Merge remote-tracking branch 'remotes/upstream/master' into 1.3Final_ADDON3_TV