Merge "Fix dialogs layout after keyboard shows up" into nyc-dev
am: b8572b3

* commit 'b8572b3d50475918d3e2b25961b7c6189d6af39e':
  Fix dialogs layout after keyboard shows up

Change-Id: I4e3285377b8133ddf1fb28ee4b6968675d2ff16e