Bug 949758 - [B2G][Settings] The highlighter for the language selection box is offset.
Bug 971704 - Clean up Wallpaper File Structure in Gaia
Bug 987071 - [Camera] The screen doesn't going to sleep in the preview gallery
Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.
Merge pull request #17942 from snowmantw/issue937442-lockscreen-window

Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.
Merge pull request #17936 from wilsonpage/bug/987071

Bug 987071 - [Camera] The screen doesn't going to sleep in the preview g...
Bug 903245 - NFC support in contacts
Merge pull request #16329 from Joshua-S/bug-971704

[Bug 971704] - Clean up Wallpaper File Structure in Gaia
Bug 987142 - [CostControl] Fix jshint errors (second part)
Merge pull request #15323 from pivanov/bug-949758

Bug 949758 - [B2G][Settings] The highlighter for the language selection box is offset.
Merge pull request #16326 from michalbe/nfc-contacts

Bug 903245 - NFC support in contacts
Merge pull request #17922 from gitmai/bug-987142-CC-jshint-fix-2

Bug 987142 -[Cost Control] Fix jshint erros (second part)
r=jmcf
Revert "Merge pull request #17807 from huchengtw-moz/system2/Bug_971554-reland-2"

This reverts commit 3c23b5013e62d6f059d9a0b9f9e8c8db0c3aa2fe, reversing
changes made to 716250e989d516c6e0c1bf5bf0d69417428f17c2.

Conflicts:
	apps/system/js/bootstrap.js