Merge "Fix flicker when entering PiP from split-screen / overview" into tm-dev