Fix #447
Simplified behavior of {ContextMenu,Window}DecorView [deploy snapshot]