Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev

* changes:
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.