Merge "Move SIP settings to phone account settings." into lmp-dev