Merge "Refactor command line IME tracing"