Merge "Revert "Let InputReader handle its own thread""