Merge "Use a const InputDeviceContext ref in HardwareStateConverter"