Merge changes I09e8be0d,Ic94816e1

* changes:
  Fix bug that soft keyboard pushes action bar out of window.
  Added 2 null checks to fix top crashers.