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: I4aea24d4ffb951c59607455bd830750b9d29c066