Merge "Adding a shared-pref to control icon theming" into sc-dev