Merge "Fix NPE in FloatingIconView" into sc-v2-dev am: 199644c397

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

Change-Id: Id2c8303401239da3a92eaeaa05d9dc47412831d0