Merge "Removing unnecessary baseContext usage in InputConsumerUtils" into main