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

* commit '38796fe16266e22c56d2eee3eb63fac0cb926aaa':
  Fix sync problems when setting up a new user and account