Merge "fixes for [2474091] Saw Poor behaviour playing a video."