Merge "Linking various settings that control icon cache to icon state" into sc-dev