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
Bug 947103 - [Video] Update to refreshed video player
bug 966027

* focus search box in e.me EvmeLoaded callback when activationIcon OR activationIconInput is clicked.

r=ranbena
Bug 974343 - Unxfail test_ftu_skip_tour.py on v1.3, bug 965912 is fixed
Bug 974048 - Improve waiting for wifi in wifi connection tests
Merge pull request #16367 from gitmai/bug-968276-CC-improve-startup-time-v1-3

Bug 968276 - 300ms startup time regression in v1.3 branch Usage app
Bug 973850 - Images are not displayed anymore in link view
Merge branch 'v1.3' into v1.3t
Merge pull request #16381 from huchengtw-moz/video/Bug_947103_v1.3

Bug 947103 - [Video] Update to refreshed video player
Merge pull request #15173 from fabricedesre/adb-debug-only

Bug 956185 - Add a 'adb only' debugging option r=kaze
Conflicts:
	build/settings.js
	build/test/integration/build.test.js
	build/test/unit/settings.test.js
Merge pull request #16448 from AndreiH/bug974343

Bug 974343 - Unxfail test_ftu_skip_tour.py on v1.3, bug 965912 is fixed
Merge pull request #16447 from AndreiH/bug_974048_v1.3

Bug 974048 - Improve waiting for wifi in wifi connection tests
Merge pull request #16362 from AndreiH/bug_965318

Bug 965318 - unxfail test_cost_control_reset_wifi on v1.3 when bug 96530...
Merge pull request #16430 from theres-waldo/master

Bug 964517 - Add solid background to apps where appropriate. r=alive
Bug 959414 - [B2G][Contacts] Cancelling out of editing or Updating a contact after importing displays broken UI
Merge pull request #16423 from nullaus/bug966027

bug 966027
Merge pull request #16424 from nullaus/bug966027

bug 966027
* fix gjslint error.
Merge pull request #16537 from nullaus/v1.3

* fix gjslint error.