Merge "Use more user actions to update the IME rotation order"