Merge "Add appropriate form-factor variants of update owner confirmation dialog string" into udc-qpr-dev