Merge "More dimming tweaks (for accessibility)" into oc-mr1-dev