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

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

Change-Id: I3943bc9286ae242dca9e9256ea34e65937463a10