Merge "Update DeviceModelPreferenceController"