Merge "Fixed a bug where a removed notification would stick around" into oc-mr1-dev