Merge "Catch bubbles exception in PeopleTiles" into sc-dev