Merge "Clean up: remove dimmableIconPreference"