Merge "Re-introduce event order guaranee in IME client registration"