Merge "Update strings for device controls settings" into udc-dev