Merge pull request mozilla-b2g#27313 from JohanLorenzo/bug-1097754-v2.1

Bug 1097754 - test_dialer_receive_call_with_locked_screen.py sometimes d...

Bug 1110068 - [Settings]DUT can't receve file via bluetooth after you…

… switch media location to internal.

Bug 1116986 - Disable failing COPPA test due to new year r=kgrandon a…

…=testonly

Merge pull request mozilla-b2g#26599 from KevinGrandon/bug_1101158_up…

…lift_v2_dot_1

Bug 1101158 - Use shared tagged template library for escaping card content

Merge pull request mozilla-b2g#25088 from chirarobert/1071647

Bug 1071647 - UI Tests: Remove cost control app kill step, make test use...

Merge pull request mozilla-b2g#24993 from viorelaioia/bug_1072343_v2.0

Bug 1072343 - Improve wait in test_camera_flash_modes.py

Merge pull request mozilla-b2g#24344 from julienw/1071605-v1.4-fix-sy…

…stem-tests

Bug 1071605 - [System] One test is failing in v1.4: TypeError: value is ...

Revert "Bug 1032675 - [System] upgrade the new default tones for OTA"…

… for jshint warnings

This reverts commit cca4705.

Merge pull request mozilla-b2g#23353 from yurenju/uuid-v1.4

Bug 1058555 - Updating preloaded apps in FOTA/OTA results in duplicate apps in /data/local/webapps r=gduan

Merge pull request mozilla-b2g#23495 from etiennesegonzac/bug-1039955…

…-2.0-uplift

Merge pull request mozilla-b2g#23404 from alivedise/bugzilla/1039955/circular-activ...