Merge "Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME"