Merge "Fix flashing dialogs when IME enters/exits."