Merge "Revert "Removing old workaround"" into sc-v2-dev am: 0ec3e647ba am: 01627fb235

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

Change-Id: Ie09130f15909a44c36ddccd014b686f1b0fcaa9b