Merge "Re-start input when the IME is deactivated but window is focused"