Merge "Fix weird animation when switching back to split pair from recents" into tm-dev