Merge "InputMapper refactor: ExternalStylusInputMapper"