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)
Merge pull request #15016 from davidflanagan/bug951920

Bug 951920: fix visuals for alternative character popups r=rudylu(cherry picked from commit 3d27ec08f47652d181f9653366143adc772c84bd)
Merge pull request #15095 from davidflanagan/bug951920v1.3

Merge pull request #15016 from davidflanagan/bug951920
Merge pull request #15061 from EragonJ/bug-955954

Bug 955954 - "SIM 1" show up on some places on a one-SIM device
(cherry picked from commit 4c64dc55d4d69cca6ca81ccffa1bf72e9a3b3ee6)
Merge pull request #14656 from etiennesegonzac/bug-937505-keypad-latency

Bug 937505 - Dialer Keypad - Touch Handling - Doing the expensive work after a tick to reduce the audio tone latency. r=rik
(cherry picked from commit 3bd9d999d30f9b5b0f2369b36d03b3d328f646fb)

Conflicts:
	apps/communications/dialer/js/keypad.js
Bug 932793 - Intermittent test "thread_ui.js > scrolling scroll 100px, should be detected as a manual scroll" r=schung a=tests

* Fix intermittent scripts by sending the scroll event in the test
* Fix bad tests that were revealed in the process: `done` callback set on the
  suite function instead of the test function, wrong SMS messages.
* Linearized and de-asynchronized some tests

(cherry picked from commit 942cba7260b3855364ece50bb0f6b9514ed84333)
Bug 957587 - Add the custom jsdoc tags for gjslint check to v1.3 r=rik a=npotb
Merge pull request #15105 from julienw/1.3-fix-gjslint

Bug 957587 - Add the custom jsdoc tags for gjslint check to v1.3 r=rik
Bug 950570 - Fix test_settings_airplane_mode.py
Merge pull request #15071 from viorelaioia/bug_957141

Bug 957141 - [v1.3] Fix failure in test_settings_airplane_mode
[v1.3] Bug 957545 - Disable test_dialer_add_contact because it's erroring on every ru
Bug 934429 - Remove layout/style reflows from the startup path r=rwaldron,julienw

- Do not lazy load CSS files as those trigger a reflow
- Do not read the height of the thread list container when starting up
Merge pull request #15113 from viorelaioia/bug_957545_1.3

[v1.3] Bug 957545 - Disable test_dialer_add_contact because it's erroring on every run