Merge "Ensure that the copy notification is always cancelable." into mnc-dev