Merge "Fix race condition on cancelling alarms" into rvc-dev