Merge "App Shortcut menu bug fixes and polish." into sc-dev am: c846245f1b am: 8e8f7f3187

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

Change-Id: I841c0c643a2b8e9c44ba2f5dd9bce4cbd8833465