Merge "Clean up InputMethodBindingController a bit"