Merge "Fix unknow language option display bug"