Merge changes Ie3a70f29,I8ce2a6f9

* changes:
  Re-enable WTFs in SyncManager for account-related errors.
  Add locking around SyncManager accounts handling.