Merge pull request #7948 from crdlc/bug-835937

Bug 835937 - [e.me] scrolling through the history ends up panning to the...(cherry picked from commit 1339da5e415db5f31f73d067d0475048864df9d7)
Merge pull request #7712 from arcturus/fix-unittest-contacts

Bug 797842 - [contacts] Unit tests are broken since search refactor(cherry picked from commit 4b42b089bf9e3fbc841062ceb61fac742f4aec3b)
Merge pull request #7925 from RudyLu/value_selector/Bug835902-wrong_month_name

Bug 835902 - Generate correct month display text without overflowing the...(cherry picked from commit 82b47138452f636f937d40e8167c93f9336da773)
Merge pull request #7953 from dhylands/dhylands-813850-master

Bug 813840 - Disable console by default in VARIANT=user builds. r=cjones(cherry picked from commit 888ba530b9f4f9119add284d98d616ea8f2348f1)
Merge pull request #7776 from RudyLu/music/Bug833517_skip_song

Bug 833517 - to clear the ended timer after setting a new audio source. ...(cherry picked from commit b192beae6b5810e81bcc6601b2048e5feae2e052)
Merge pull request #7962 from jmcanterafonseca/duplicated_link

Bug 837905 Contact edit mode is permanently disabled upon deleting one o...(cherry picked from commit b7a0e1cfdc22d30b05e47dd1927d074a2d47311d)
Merge pull request #7947 from lodr/bug-837652-proactive-behavior

Bug 837652 - Checking balance when endind an outgoing call or sending a SMS
Cause r+(cherry picked from commit c419284fe96fb4ad71a735dc81f12328697d393a)
Merge pull request #7868 from jmcanterafonseca/fix_sim_import_fb

Bug 835555 - Progress when importing SIM contacts(cherry picked from commit c7534891362d5821befec705d5adefab3e55559a)
Merge pull request #7956 from crdlc/bug-820100

Bug 820100 - [e.me] browser context should not be shared between two app...(cherry picked from commit d5713e58c38ea772d940ce7d0155eb2b9406aa20)
Merge pull request #7864 from frsela/STK/Bug836135

Bug 836135 - STK PLAY_TONE does not process any button presses, r=vingtetun
Merge pull request #7940 from frsela/STK/Bug836135_b

Bug 836135 - STK PLAY_TONE does not process any button presses, r=vingtetun
Bug 824575 - Add warning dialog when upadting via 3G network, r=timdream, a=tef+
Merge pull request #7975 from crh0716/v1-train_3g_update

Bug 824575 - Add warning dialog when upadting via 3G network, r=timdream, a=shira+
Bug 834191 - Captive portal w/ quick settings
Merge pull request #7944 from alivedise/bugzilla/834191_v1-train/quick-setting-captive-portal

Bug 834191 - Captive portal w/ quick settings, r=timdream, a=blocking-b2g:shira+
Bug 836609 - Add data roaming warning dialog
Merge pull request #7987 from crh0716/v1-train_836609

Bug 836609 - Add data roaming warning dialog, r=kaze, a=shira+
bug 838690 - fix nightlies. Revert "Merge pull request #7651 from stasm/823478-add-shira-locales"

This reverts commit fd41681a3b52f2be790b257cbee9fe9c2fc2732c.
Bug 838024 - Add the captive portal icon
Merge pull request #8006 from crh0716/v1-train_838024

Bug 838024 - Add the captive portal icon, r=timdream, a=shira+