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

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

Change-Id: I02f302f232dca3f761f14829d2dad077b71b80f2