Merge changes Ieea9a13a,Id2ae6151 into nyc-dev

* changes:
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".