Merge "Ensure mConsumer isn't set to null in reset()." into sc-dev am: 82fc5c83a5

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

Change-Id: Ia8a964effbc89754cd7f29986404d6ba1474a668