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

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

Change-Id: Iebc310880d1d0a6acd6b3b47fb586a400401cadf