Merge "Add a block list to IconManager" into sc-dev