Merge "new two-pane layout" into jb-ub-mail