Merge "Fix SelectDSUPreferenceControllerTest"