Merge "Revert "Instrument latency and jank for IME""