The sample was fixed to use consistent notification ids for notify() and cancel(), so implement the change here too
Merge branch 'fix-ids' into synchronizednotification-easy-sample