[DF-4408] fix after merge.
Merge branch 'DF-4408_ButtonStates' of https://github.com/dava/dava.framework into DF-4408_ButtonStates