Merge remote-tracking branch 'remotes/upstream/MP1-4327-BUG-Fast_switching_visualization_can_lead_to_crash' into 1.6.0Fork-BDJ
Fork : WIP MP1-2564 to avoid hang while switching mp4v to mp4a.