Merge "New PIN pad design"