Merge "Handle IME target change gracefully"