Framework changes to support StepButton and Keyboard at once
Trial in Caesar