Merge "Ensure InputConsumer is non-null in remaining cases" into sc-dev