Remove window handler from proper place in the stack when popped
Prevent multiple removals of the same layer from the display. More work needs to be done to clean up hanging layers.
Merge branch 'develop' into feature-windows