Merge "Update GsmConference state to the same as its child calls." into lmp-dev