Merge "Adding support for using themed icons on workspace" into sc-dev