Merge "Flow text around the large icon." into sc-dev