Merge "InputDispatcher_test: Fix death tests"