Merge "Update initial staged split UX." into tm-dev