Bug 1082645 - Cover the fullscreen_layout software home button toggle with a marionette test
Merge pull request #25677 from mikehenrty/bug-1069608-remove-workaround

Bug 1069608 - Remove sim pin input scrollIntoView workaround
Bug 1091645 - Wait for system boot before testing net_error
Merge pull request #25670 from mikehenrty/bug-1091645-net-error-fix

Bug 1091645 - Wait for system boot before testing net_error
Bug 1091310 - block-type tags inside a tags should be wrapped by the a tag r=asuth
Merge pull request #25712 from jrburke/bug1091310-email-closing-a-tags-blocks

Bug 1091310 - block-type tags inside a tags should be wrapped by the a tag r=asuth
Bug 1068918 - [Camera] Preview header should be first thing in markup
Bug 1091936 - Update hotspot dialog strings r=flod r=aryx
Merge pull request #25711 from KevinGrandon/bug_1091936_update_hotspot_strings

Bug 1091936 - Update hotspot dialog strings
Revert "Bug 1080169 - Update test_sms_with_attachments.py to correlate with the manual test"

This reverts commit 790c4452794bc883539a043ee5e8b425d4522930.
Revert "Bug 1090087 - Add test for saving an image from a webpage"

This reverts commit d0907e612aa9b38daab6a2f3161517d91619f62d.

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/browser/test_browser_save_image.py
Merge pull request #25722 from patelba/1068918

Bug 1068918 - [Camera] Preview header should be first thing in markup
Merge pull request #25142 from etiennesegonzac/bug-1082645

Bug 1082645 - Cover the fullscreen_layout software home button toggle with marionette tests r=kgrandon
Bug 1005446 - [email] custom elements for cards
avoid body work if the header no longer matches, or if card has been destroyed
Merge pull request #23230 from jrburke/bug1005446-email-custom-elements

Bug 1005446 - [email] try custom elements for cards r=asuth