Merge "Move static functions to InputConsumer cpp file" into main