Merge "Remove the dependency on InputMethodSettings"