Merge "Improve the staged split animation" into tm-dev