Merge "Increase People Tile restore timeout to 48h" into sc-dev