Merge "Do not dim icons when Preference is Disabled"