Merge "Add TODO comments to Language & input settings"