Merge "SF: avoid rearming Timer during cancel" into rvc-dev