Merge "Update Overview UI to new layout." into sc-dev