Bug 1069184 - [ftu] unittest navigation_test.js incorrect using assert.include for testing existing object property
Bug 1070905 - (way) Better Cards View performance
Bug 1061440 - Provide an option for restoring only apn items instead of the entire apn settings

Conflicts:
	apps/settings/js/modules/apn/apn_settings_manager.js
Bug 836690 - Follow up: Add localization comment for sms segments information string. r=flodolo
Bug 1068619 - [v2.2] [v2.1] Investigate test_browser_search failure
Bug 1058793 - [RTL] New System Update notification need RTL support
Bug 1057977 - [Status Bar] Remove AM/PM indicator
Bug 1069885 - [System][Video][Ringtone]Video app shows Share with ringtone application
#1065753 Remove sb-icon-notification from statusbar stylesheet R=gauravmittal1995
Bug 1070207: create a suite of Gallery test images
Merge pull request #24358 from davidflanagan/bug1070207

Bug 1070207: create a suite of Gallery test images r=justindarc
Bug 1068986: convert MediaFrame to use background-image instead of <img>

fix failing unit tests

fix the failing python unit tests with a CSS selector change

fix busted share button by restoring public imageblob property on MediaFrame
Merge pull request #24312 from steveck-chung/bug-836690-follow-up

Bug 836690 - Follow up: Add localization comment for sms segments information string. r=flodolo
Bug 1070843 - [Text Selection] hide bubble when reasons contains collapsetoend
Merge pull request #24032 from crh0716/1061440

Bug 1061440 - Provide an option for restoring only apn items instead of the entire apn settings r=eragonj
Merge pull request #24356 from gauravmittal1995/css

#1065753 Remove sb-icon-notification from statusbar stylesheet R=gauravmittal1995
Bug 1071707 - Remove browser dependency from marionette tests r=Cwiiis
Merge pull request #24352 from KevinGrandon/bug_1071707_homescreen_marionette_test_browser_dep

Bug 1071707 - Remove browser dependency from marionette tests
Bug 1070914 - [Contacts] [Settings] SIM Import label has disappeared
Bug 1070861 - [FTU] Wifi searching icon moves