Merge "InputHub: Fix compiler warnings"