Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev