really fix gala-notifications
fix identing
popover fixes
some cleanup
Merge branch 'master' into 3.16