Merge "Reduce flicker while split entering animation" into tm-qpr-dev