Merge branch 'mm/config-color-ui-default-to-auto'