main
Fix more mocks and skip tests we don't need
Merge branch 'upstream-at-v3.36.2' into roo-v3.36.2
Add a hint about using todos for complicated tasks (#5473)