Merge changes from topic "flaky_items" into tm-dev

* changes:
  [automerge] Fix flaky ItemsProviderTest 2p: 5675e56e0b
  Fix flaky ItemsProviderTest