Merge "Add feature flag for connected device"