Merge "Fixed AutoDataSwitchPreferenceControllerTest" into main