Merge "Change InputReader::mDevices collection type"