Make sure the button handles enabled/disabled changes during interaction properly
Merge remote-tracking branch 'origin/button-model-logic' into button-model-logic