Merge "Turn ENABLE_DEVICE_SEARCH to DeviceConfig flag"