Merge "Fix nascent timer never get removed" into sc-dev