Merge "Remove unnecessary input event indirection"