Bug 960114 - Multiple CSS warnings shown when launching the Gallery app
Bug 956174: copy the settings panel from system keyboard
Bug 968122 - Add default styles for homescreen dialogs
Bug 968069 - Make header (month date) localizable in thumbnail view
Bug 969301 - Line number in coverage report looks weird
Bug 963917: reduce Gallery memory use (and fix leak) while scanning

force software canvases for thumbnail and preview creation with willReadFrequently

Free canvas memory after creating a thumbnail

Make sure our thumbnail blobs are file-backed not memory-backed

update mediadb docs
(cherry picked from commit 4b5eaa4a2823d8961b80a3b975b1eeed92b9fcb7)

Conflicts:

	apps/gallery/js/MetadataParser.js
	apps/gallery/js/gallery.js
Bug 970320 -[Cost Control] Add configuration to provide top-up & check balance in Movistar Uruguay
Bug 952797 - Reactivation the dialer keypad integrations tests.
(the marionette issue was fixed by bug 891882)
Bug 970255 - escape $ signs in l10n arguments
Bug 930563 - [B2G][L10n][Clock] Chinese Traditional: Highlight date instead of first number displayed.
Bug 952912 - Check for update is on even for NOFTU builds.
Bug 971392 - [lockscreen] notifications not showing
Bug 971397 - [customization] usage guide referenced in README is moved to MDN
Bug 970238 - NFC: System app always send NFC_HW_STATE_DISABLE_DISCOVERY
to Gecko
Merge pull request #16169 from allstarschh/Bug970238

Bug970238
Merge pull request #16192 from gasolin/issue-971397

Bug 971397 - [customization] usage guide referenced in README is moved t..., r=yurenju
Merge pull request #16077 from RickyChien/issue-969301

Bug 969301 - Line number in coverage report looks weird r=@yurenju
Bug 968657 - Add |make watch| to monitor files change and build for specific app.
Bug 971423 - [LockScreen] Notifications and music widget behind the passcode pad
Merge pull request #16191 from caseyyee/bug-971392

Bug 971392 - [lockscreen] notifications not showing