Merge "Reorganize phone account settings." into lmp-dev