Merge "Fix NPE in SyncManager#isSyncSetting." into sc-dev