Merge "Change People Tile config activity layout" into sc-dev