Merge "Disable user control of color mode depending on Accessibility" into pi-dev