Merge "Deprecate EXTRA_PROVISIONING_MAIN_COLOR" into sc-dev