Merge "Fix NPE in AutoSyncWorkDataPreferenceController"