Merge "Cleaning up UI jank while quick switching" into tm-qpr-dev