Merge "Fix cancel when the same notification is enqueued twice." into oc-dev