Merge "Let InputDispatcher handle its own thread"