Merge "Fix flag value for configuration_optional widget feature." into sc-dev