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

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

Change-Id: I05589cc3531e4de5f0bd2224d7fe2a9a75e061c1