Merge "Update icon in lock consent dialog" into udc-qpr-dev