Merge "InputDispatcher: Fix incorrect sensorType parameter when debugging" into sc-dev