Merge "Factor out IMMS#resetCurrentMethodAndClient()."