am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev

* commit '83930aa09aecef7429d8a1c07b80f10b7e2e13f6':
  Fix broken IME when decrypting storage