Merge "DisplayImeController: fix out-of-sync IME visibility"