Merge "Change feature flag to device config flag." into udc-qpr-dev