Merge "Ensure PIN/PUK status is taken into account on HAL 1.4+" into sc-qpr1-dev