Merge "Reduce flicker for split resizing" into tm-qpr-dev