Bug 936353: when confirming a pick from the camera, display the EXIF preview, not the full-size image
(cherry picked from commit 21d0c957a3bd47d1c4fdeb2c7c24fd7f1d11cb7a)
bug 957733

* Add v1.3 specific implementation for parsing the about:neterror URL.

r=mhenretty
Merge pull request #14730 from davidflanagan/bug936353-v1.3

Bug 936353: when confirming a pick from the camera, display the EXIF preview r=wilsonpage
Bug 928968 - Add a command to the gaia command line tool to print the applications installed. r=zcampbell r=rwood
Bug 948596 - fullscreen state of activity window

Conflicts:
	apps/system/js/activity_window.js
	apps/system/test/unit/activity_window_test.js
Merge pull request #15115 from viorelaioia/bug_957645

Bug 957645 - [v1.3] Update runningApps method in GaiaTest
Merge pull request #15120 from nullaus/bug957733-net-error

bug 957733 r=mhenretty