Merge "Remove reference to preference_category_material_settings"