Merge "Fix timer cancel() implementation."