Merge pull request #14639 from crh0716/913326

Bug 913326 - Set voice privacy mode at startup r=alive, jaoo
(cherry picked from commit 8759f9916c119de88e62598d2451b2339011085a)
Merge pull request #13701 from viorelaioia/bug-932723

Bug 932723 - Add a test to verify that received SMS are notified to the user
(cherry picked from commit 0ef52554acf8cc115e40a95b2eab0117df3dff45)
Merge pull request #14806 from gtorodelvalle/contacts-bug-949470-ben-kelly-patch

Bug 949470 - [Contacts] Broken image links when entering the search mode
(cherry picked from commit adba622b1072a94426ba618fb3e407e4393461df)
Merge pull request #14751 from TheoChevalier/call-waiting-switch-fix

Bug 951123 - [Settings] Call waiting switch on "Confirm Call waiting", r=kaze
(cherry picked from commit b12152456063166e3539e59a3d476b7bde8cffe4)
Merge pull request #14840 from gtorodelvalle/contacts-bug-946260-broken-links-when-scrolling

Bug 946260 - [Contacts] Broken link image shown for contacts when scrolling instead of their photo
(cherry picked from commit ae731e303597aac1cb00657e5e60e4e9f58f4013)
Merge pull request #14740 from rexboy7/fix-bug946730

bug 946730 - [Dialer] Do not show "xxx left" when hanging up the whole group call. r=etienne
(cherry picked from commit a49881df9a1ca48cea47e2e274cfa85a976e18bd)
Merge pull request #14540 from jmcanterafonseca/fix_fb_flashing_imgs

Bug 946064 - [fugu][buri][contact] contact photo refresh when taping on ...
(cherry picked from commit 7173a82a65719aeae83c5b393f1320368bc4b5c0)
Merge pull request #14866 from acperez/bug-951450

Bug 951450 - Flashing customizations currently fails with exception. r=yurenju
(cherry picked from commit 1ca7f67b46cf840202bb122273d9de51ba4e3026)
Merge pull request #14962 from EverythingMe/946724-collections-unsupported-locale

Revert "Revert "Bug 946724 - [e.me] Collection suggestions for unsupport...
(cherry picked from commit baf9f72b71fb126999c6b455363f6a207b7c49bd)
Merge pull request #14633 from gitmai/bug-948798-CC-reset-wifi-not-refresh

Bug 948798 - [Cost Control] After reset Wifi usage, the usage does not b...
r=me
(cherry picked from commit 0a682dc32194b4f66a811f6cd2dbe423458bfb99)
Merge pull request #14214 from crh0716/944230

Bug 944230 - Remove the use of IccHelper r=rik
(cherry picked from commit 9a222ac02db176e47299bb37112ae40aeadbeca7)
Merge pull request #14870 from gasolin/issue-952244

Bug 952244 - Remember my choice is showing up again on gUM audio permiss..., r=alive
(cherry picked from commit 1584816093182199576467b63d8c7e19c035a3a8)
Merge pull request #14892 from etiennesegonzac/bug-948975-resume-single-conference-group

Bug 948975 - Safeguard to make sure we can always resume a single held conference call. r=rik
(cherry picked from commit 7354e63bc91309895b85ca711baa5caff2991c73)
Merge pull request #14784 from nullaus/bug949286-net-error

bug 949286(cherry picked from commit 6bf24fc3ce7947b70acd2c6f915804f760543fc8)

Fixed Conflicts:
	apps/system/js/net_error.js
Merge pull request #14103 from mikehenrty/bug-926347-dualsim2

Bug 926347 dualsim2
(cherry picked from commit e2c232208f0177d7a9305a60a6c59e62d98a67a2)
Revert "Merge pull request #14214 from crh0716/944230"

This reverts commit 32c7efdaf9039be5f9f09fee3086a442104a60a3.
Merge pull request #14912 from davidflanagan/bug939679

Bug 939679: compute the right camera preview size on HD devices r=dmarcos(cherry picked from commit 4245fb93e747d3e3cc9e50ba6fa2f084c9cb682f)
Merge pull request #15085 from davidflanagan/bug939679v1.3

Merge pull request #14912 from davidflanagan/bug939679
Merge pull request #14814 from eeejay/bug-940633

Bug 940633 - [Cost Control] Fix alignment of checkboxes in usage tab.
(cherry picked from commit f0ce4f4ef5ba10fd147fbed2a4eb5d0fc2e4324c)
Merge pull request #15051 from davidflanagan/bug939962

Bug 939962: set the willReadFrequently flag when creating the 2D context... r=snorp
(cherry picked from commit bb2d680da76b31fa4e33e00b07af0df3d0285fa2)