Merge "Re-register phone accounts when logged in user changes." into nyc-mr1-dev