Merge "Fix CastError on SecondaryDisplay" into sc-dev am: c632e36dc0

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

Change-Id: I206b4292e82800de060476d38866cfdc2944e809