Merge "Add DeviceConfig feature flag type to SystemUI" into tm-qpr-dev