Merge "Update input method menu to use proper context." into oc-dev