Merge "Fixes to mw.notifications"