Merge "Fix crash when clearing all notifications" into nyc-dev