Merge "Fix issue #3153930: orphan window left on screen" into honeycomb