Merge "Do not unsnooze canceled notifications." into oc-dev