Merge "Fix an edge case in IMS#switchInputMethod()" into udc-qpr-dev