show/hide keyboard fixed for 2.3
Merge branch 'keyboardFix' into dev