Merge "Merge "Reduce flicker while split entering animation" into tm-qpr-dev am: 455985f9 am: 722b72ad"