[DF-4113] Fix review comments, small refactoring.
Merge branch 'UIKeyboard' of https://github.com/dava/dava.framework into UIKeyboard