Merge "Change UI to represent conferenced IMS connections (1/3)" into lmp-dev