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