Bug 951130 - Contacts Export view is visually incorrect
Bug 957708 - [Messages][Drafts] Draft status indicator not accurate when app loads r=rwaldron
Merge pull request #15360 from rnowm/951130

Bug 951130 - Contacts Export view is visually incorrect
Bug 959661 - [Messages][Drafts] Only set MessageManager draft if not in thread (to thread's draft, or null if thread has no draft)