Merge "MetricsCollector: Do not store entire InputDeviceInfo for space efficiency" into main