ActiveAE: do reset timer of state machine on other events
Merge pull request #3577 from FernetMenta/aefixes

ActiveAE: do reset timer of state machine on other events