am 98b938b1: Actually remove the subwindow.

Merge commit '98b938b111eee332624a45728959e55f9d982797' into gingerbread-plus-aosp

* commit '98b938b111eee332624a45728959e55f9d982797':
  Actually remove the subwindow.