Merge "Icon sizes/ keyline / font for AA+ results" into sc-dev