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

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

Change-Id: Ia7042e276a46cf0585376e36ac62d5f53ef5bd6f