Merged off-control changes from MechaCrash, including preliminary support for 5x5 matriced pinpads.