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

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

Change-Id: I1f820134d767abd5774e0d752786e9e174c06fed