Merge "Fix NPE in LockSettingsService." into cw-f-dev