Merge "Revert "Make IME handling deterministic in CryptKeeper""