Merge "Use correct binding flags when reconnecting to IME" into oc-dev