Merge "Avoid unnecessary Clock GC churn" into tm-dev