Merge pull request #15977 from mikehenrty/bug-966571-retrycount

Bug 966571 - Retry count not shown up in System SIM Dialog, r=arcturus,alive,ferjm
(cherry picked from commit 9de7295648e4bbbacfb90e897f50fbae0de4ee43)

Conflicts:
	build/jshint/xfail.list
Revert "Merge pull request #15808 from pmclanahan/send-language-to-basket-964342"

This reverts commit 22239db3cac45568b07a84a12a15a3a5b31cabc3.
Merge pull request #16131 from gabrielesvelto/bug-917193-tones-glitch-workaround

Bug 917193 - Use samples instead of waveform generators for short audible tones
(cherry picked from commit 3c2e748e4d57551527366eba00428a0f5ccc4012)
Xfail test_cost_control_data_alert_mobile.py because of Bug 971696 - [v1.3][Cost Control] No data usage is available in notification bar or app
Merge pull request #16246 from chirarobert/v1.3_xfail_cost_control

Xfail test_cost_control_data_alert_mobile.py because of Bug 971696 - [v1...
Bug 968049 - Don't try to reload a null URL when reviving crashed tabs
Merge pull request #14918 from EverythingMe/941637-eme-aria

Bug 941637 - App icons don't have alt text so screen readers can't read ...
Merge pull request #15360 from rnowm/951130

Bug 951130 - Contacts Export view is visually incorrect
Merge pull request #16234 from mikehenrty/bug-966571-uplift

Merge pull request #15977 from mikehenrty/bug-966571-retrycount
Bug 972136: never display filmstrip when handling a pick activity.
Unxfail test_cost_control_data_alert_mobile.py because Bug 971696 was fixed.
Merge pull request #16071 from flodolo/bug968071_mediainfo

Bug 968071 - Taken/Shoot date in image/video info not localizable
Merge pull request #16260 from staktrace/browser

Bug 970428 - Don't run through the code to show the address bar if the s...
Merge pull request #16279 from davidflanagan/bug972136

Bug 972136: never display filmstrip when handling a pick activity. r=dmarcos
Bug 968963 - [E.me] Collection static apps names are not translated [r=ranbena]
Revert "Bug 968963 - [E.me] Collection static apps names are not translated [r=ranbena]"

This reverts commit f495f10df8c6f2c056d22d1878d46bccdae24835.
Merge pull request #16291 from chirarobert/v1.3_unxfail_data_alert

Unxfail test_cost_control_data_alert_mobile.py because Bug 971696 was fi...
Bug 965318 - unxfail test_cost_control_reset_wifi on v1.3 when bug 965305 is fixed
Bug 968276 - 300ms startup time regression in v1.3 branch Usage app
Merge pull request #16201 from gitmai/bug-970323-CC-widget-broken-disable-airplane-mode

Bug 970323 - Cost control in the notification panel broken after disabli...
r=salva
Conflicts:
	apps/costcontrol/widget.html