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

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

Change-Id: I6e8bc29acd085990294f8b715cde9b6c18561617