Merge "Remove getSfInstance from InputConsumerController" into tm-dev