Merge "Fix NPE when consuming snapshots for recent animation" into sc-v2-dev am: f6086e74e3 am: 0e22f9947b

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

Change-Id: I7cd1665d8bc22aecfa9feb39261087656be7facf