Merge "Added DeviceConfig properties to fine tune ContentCapture:"