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

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

Change-Id: I3396430ac4b4ab3637b7fbde03759e1852c526e0