Merge "Sync phoneAccountHandle when phone is changed"