Bug 824835 - Display the location info for the events which is cross the next day.
Bug 864699 - FTU need tests: Added test for SIM Management
Bug 829023 - [Settings] Don't use dividers to separate paragraphs in the same text block

Conflicts:
	apps/settings/index.html
Bug 877595 - Make mozContacts works again with the browser-helper extension
Bug 877166 - [SMS][Regression] Delete button is not disabled when no item is selected
Bug 878326: do not crash when removing sdcard during video playback
Merge pull request #10141 from davidflanagan/bug878326

Bug 878326: do not crash when removing sdcard during video playback. r=daleharvey
Bug 860605 - [Email/IMAP] Initial synchronization is too conservative on time windows, especially when the folder has a small number of messages. rs=squib

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/215
Merge pull request #10143 from asutherland/email-faster-deepening

Bug 860605 - [Email/IMAP] Initial synchronization is too conservative on time windows, especially when the folder has a small number of messages. rs=squib
Bug 876597 - Disable the power button when the airplane mode is on
Merge pull request #10051 from crh0716/876597

Bug 876597 - Disable the power button when the airplane mode is on
Bug 874737 - Lock orientation for inline activity
Merge pull request #10072 from alivedise/bugzilla/874737_master/lock-orientation-for-inline-activity

Bug 874737 - Lock orientation for inline activity, r=timdream
Bug 869903 - Use black as the default background of packaged apps
Merge pull request #10119 from michaelwu/bug-869903

Bug 869903 - Use black as the default background of packaged apps
Bug 873407 - [Buri]Time on status bar won't update immediately when set time in Settings.
Bug 868902 - [Buri]data connection and hotspot still enabled without SIM
Merge pull request #10066 from huchengtw-moz/settings/Bug_868902_data_connection_and_hotspot_still_enabled

Bug 868902 - [Buri]data connection and hotspot still enabled without SIM, r=@alivedise
Merge pull request #10149 from huchengtw-moz/system/Bug_873407_time_on_status_bar_wont_update

Bug 873407 - [Buri]Time on status bar won't update immediately when set ... r=@alivedise
Merge pull request #10123 from huchengtw-moz/sms/Bug_877166_Delete_button_is_not_disabled_when_no_item_is_selected

Bug 877166 - [SMS][Regression] Delete button is not disabled when no item is selected. r=steveck-chung