Add patch to repair a mismerge

The mismerge caused the IME to always show whenever a hard keyboard was present.