Merge "Start edge extension animations in sync" into tm-dev