Pass on cancel event to the window shutdown handler
Merge pull request #3101 from DynamoDS/master_shutdownCancelFix

Pass on cancel event to the window shutdown handler