Merge "Fix attachment Overflow and Cancel buttons pushed off-screen" into jb-ub-mail