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

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

Change-Id: Ib5e876d1cd1f0a052dc5511a41c8843a11260ac5