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