Merge "Fix the display name in the input method panel on tablet"