Merge "Improve performance of edge extension animation" into tm-dev