Merge "Fix cancellation of foreground service notifications"