Merge "Fix regression in PeopleSpaceActivity benchmark" into main