Merge "Use sp for screenshot button icon size" into sc-dev