Fix modal popup position when unmaximizing
Merge pull request #2351 from ollb/bugfix/modal_position_when_unmaximizing

Fix modal popup position when unmaximizing
Fixed tooltip show/delete for generic popups
Merge pull request #2352 from yakky/feature/fix_tooltip_generic

Fixed tooltip show/delete for generic popups