Merge "Fix padding for SIM pin entry."