Bug 837634 - Fix collisions when several [BB]'s are applied together
Bug 838006 - Modify gallery and email to support attaching image files from picker
Fix lint errors
Merge pull request #8542 from rnowm/collisions

Bug 837634 - Fix collisions when several [BB]'s are applied together
Bug 849924 - process/render the email body once the card transition
started
r=asuth
Merge pull request #8649 from etiennesegonzac/email-body-after-card-transition

Bug 849924 - process/render the email body once the card transition started
Merge pull request #8475 from dominickuo/email-attach-from-gallery

Bug 838006 - Support attaching image files from gallery picker in email. r=asuth
Bug 838005 - SMS - Updated with review inputs
Merge remote-tracking branch 'upstream/master' into sms-url-838005