Merge "Fix the crashed problem at the AccountSyncSettings"