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

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

Change-Id: I62474d57d056ee01f62a4f7c7147cca43ab9f600