Merge "Fix sync initialization on secondary users"