Cancel a notification before reactivating it to make sure it makes sound
Merge remote-tracking branch 'origin/develop' into develop