Merge "Fix UwbPreferenceControllerTest"