Merge "Fixed a11y announcement while setting a PIN" into udc-qpr-dev