Merge "Add icons for staged split" into sc-v2-dev