Merge "Fix CallsAndAlarmsPreferenceControllerTest" into main