Fix esc/"x" closing of quest window to properly track closure
Merge branch 'quest-ui' into mergedmaster2