Merge "Prevent lock icon a11y when unlocking." into udc-dev