Merge "Let InputReader handle its own thread"