Bug 831890 - [B2G][GALLERY] Crop Handles (Markers) disappear after changing orientations.
Bug 935095 - [Gallery] 1.3 Back button position not to spec
Bug 962040 - Add bug # in comments to reenable apps.
Bug 972771 - Fix failure in test_gallery_delete_image.py
Bug 970940 - [JavaScript Error: 'TypeError: this._port is null' {file: app://system.gaiamobile.org/js/rocketbar.js line: 311}]. r=kgrandon
Bug 972245 - Facebook photos can appear distorted in the call log. r=etienne
Revert "Merge pull request #15897 from snowmantw/issue960901-instantiable-lockscreen"

This reverts commit efba9babeedbb0c9af9b7cb91a5630d7be2f5d8d, reversing
changes made to 8ac5dc6b76709e742cb923c58d1f4b415b3e08fb.

Conflicts:
	apps/system/js/storage.js
Revert "Merge pull request #16261 from dmarcos/bug960611+bug958200"

This reverts commit 3d01dbcfe42d6f57c794855b8c4bcc462e4e38d1, reversing
changes made to c83c1807de0182ee7e5cbdc9d5bdc7e4a5f6e08d.
Merge pull request #16276 from hfiguiere/bug962040

Bug 962040 - Add bug # in comments to reenable apps. r=julienw
Bug 971559 - Fix test fallout from bug 960901 being backed out.
Merge pull request #16294 from vingtetun/bug970849

Bug 970940 - [JavaScript Error: 'TypeError: this._port is null' {file: a...
Bug 972365 - event.preventDefault() is called unexpectedly in apps/system/js/browser_context_menu.js. r=kgrandon
Bug 972742 - [Music] Handle mozNfc api correctly
Bug 965805 - Calling nsITabParent::InjectTouchEvent can results into an out of sync TabParent::mEventCaptureDepth. r=etienne
Merge pull request #16309 from vingtetun/bug972365-v3

Bug 972365 - event.preventDefault() is called unexpectedly in apps/syste...
Merge pull request #16299 from vingtetun/972245

Bug 972245 - Facebook photos can appear distorted in the call log. r=eti...
Bug 971006 - Remove a sync reflow when showing the utility tray. r=etienne
Merge pull request #15521 from huchengtw-moz/gallery/Bug_831890-crop-handles-missing

Bug 831890 - [B2G][GALLERY] Crop Handles (Markers) disappear after chang... r=djf
Merge pull request #16286 from viorelaioia/bug_972771

Bug 972771 - Fix failure in test_gallery_delete_image.py
Bug 960611 - [Camera] Create mechanism to save/load user settings