Merge "Add INVALID_INPUT_DEVICE_ID to IInputConstants"