Merge "Use the same margin below and above the attachments divider bar." into jb-ub-mail