Merge "Use InputDeviceIdentifier.getCanonicalName"