Merge "Clean up EuiccPreferenceController" into main