Merge "Fix flaky tests in PeopleSpaceWidgetManager" into sc-dev