Merge pull request #15955 from Rik/inactive-group-after-finishing-call-966951

Bug 966951 - "Group Call" is inactive when received call is hung up r=etienne
Bug 991628 - [Settings][OMA CP] Not possible to select an APN received via OMA CP message if there is already one with the same name