Merge "Using BaseIconFactory to draw legacy icon." into sc-dev