Merge "Cleanup swapped IMS connections." into tm-dev