Mantis #4353 : Fix cancel dialog and resume with internal menu.
Merge remote-tracking branch 'remotes/origin/master' into EXP-Added_Option_to_play_TS_Files_with_Movie_Codec