Merge "Call stopSelfWhenDone() *after* canceling the notification." into nyc-dev