Merge "Revert "Fix regression in PeopleSpaceActivity benchmark"" into main