Merge "Add DeviceConfig namespace for AppSearch" into sc-dev