client/Android: fix keyboard
Merge remote-tracking branch 'upstream/master'