Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1