Merge "Fix broken IME when decrypting storage" into klp-modular-dev