Merge "Fixed an issue where would could be left with empty notifications" into oc-dev