Merge "Update icon for language settings" into oc-dr1-dev