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

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

Change-Id: I742efdbd334bc5c6ee57429facf150f03f658b08