Merge branch 'main' into state-based-tf

Author: MagicalMeghan

compose/recomposehighlighter/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt

@@ -89,6 +89,11 @@ private class RecomposeHighlighterModifier : Modifier.Node(), DrawModifierNode {
 
     override val shouldAutoInvalidate: Boolean = false
 
+    override fun onReset() {
+        totalCompositions = 0
+        timerJob?.cancel()
+    }
+
     override fun onDetach() {
         timerJob?.cancel()
     }