Merge "Add new category for input setting and language setting"