am 459bc29d: am 98b938b1: Actually remove the subwindow.

Merge commit '459bc29d145e754d93c79d30314cd1d162b3cc61'

* commit '459bc29d145e754d93c79d30314cd1d162b3cc61':
  Actually remove the subwindow.