Merge "InputTracer: Use InputThread instead of std::thread" into main