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

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

Change-Id: I20e67919b9e5f6734aa29748a893e5f60fa7dafd