Issue #2375609 by eshta: fix event listeners for add/exit goals unibar menu item.
Merge branch 'Issue-2375609' into 7.x-1.x