Merge "Update the string of Settings preference for device lock" into udc-dev