Merge "Remove InputForwarder"