main
Merge branch 'upstream-at-v3.36.2' into roo-v3.36.2
Merge branch 'upstream-at-v3.21.5' into roo-v3.21.5
Task and TaskProvider event emitter cleanup + a few new events (#6606)
Merge branch 'upstream-at-v3.25.8' into roo-v3.25.8
Increase suite-level e2e test timeout (#4975)