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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14430001

Change-Id: I078a02d5b7682e2ae8842fc8620941f87172782e