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

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

Change-Id: I06b7f2356825b2a2672a2787e0a8a4659e9cb3d3