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

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

Change-Id: I2ee07545b2837e82b438e88d3cfb01c38d7ad76e