Merge "Make BaseIcon.Workspace so that it can be overriden." into sc-dev