Merge "Reduce switch split flicker on protrait split" into tm-qpr-dev