Merge "Reduce flicker when split pair switching" into tm-qpr-dev