#349 - Activate/deactivate active view on popup show hide
Merge branch 'GH349-activate-deactivate-view-popup-show-hide'