Merge "Integrate recent animation of single-root split with shell transition" into tm-dev