Merge "Return events from mappers and InputDevice"