Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev