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

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

Change-Id: I5d41a3861d869378114fb4c10dbd3aad738b60dd