Merge "Increase maximum pin pad size"