Merge "Fix flicker while resizing split screen" into tm-dev