Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s)
Bug 1029542 - Work around bug 1029542 so we can see collection bg image as we scroll
Bug 1030153 - [Camera] Some Options menu icons missing
Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after failed cronsync(s) r=mcav
Merge pull request #20981 from justindarc/bug1030153

Bug 1030153 - [Camera] Some Options menu icons missing
Merge pull request #20954 from lightsofapollo/bug-1029542

Bug 1029542 - Work around bug 1029542 so we can see collection bg image ...
Revert "Merge pull request #20501 from sfoster/bug-1023179-tutorial-tests" for Gaia-ui test failures

This reverts commit 82cccd171556baa330a2ae26aaf994987aee19c2, reversing
changes made to bd5888a2c883712d07a058e4600bfa04b8b19af4.