Merge "Fix scrim in PIN/PUK."