Bug 935636 - Avoid duplicating data on contact merge
Bug 1018042 - [Settings] Pass available size as number to l10n.js
Bug 1020961 - [Collection app] Loading progress indicator and Connectivity message [r=amirn, kgrandon]
Bug 1020342 - Update marionette client in gaiatest to 0.7.9
Bug 976024 - Unique Set Size in the Developer HUD. r=21
Bug 1024239 - [video] New menu on video is not localized
Merge pull request #19343 from michalbe/Bug935636

Bug 935636 - Avoid duplicating data on contact merge
Update README.md of settings app
Bug 1024295 - [bb][header] Missing images
Merge pull request #20412 from pivanov/bug-1024295

Bug 1024295 - [bb][header] Missing images
Merge pull request #20290 from EverythingMe/1020961-indications

Bug 1020961 - [Collection app] Loading progress indicator and Connectivity message
Merge pull request #20146 from jankeromnes/uss

Bug 976024 - Unique Set Size in the Developer HUD. r=21
Merge pull request #20363 from zacc/bug_1020342

Bug 1020342 - Update marionette client in gaiatest to 0.7.9
Merge pull request #20357 from flodolo/bug1018042

Bug 1018042 - [Settings] Pass available size as number to l10n.js
Merge pull request #20393 from TheoChevalier/video-menu-l10n

Bug 1024239 - [video] New menu on video is not localized
Bug 1022132 - Disable test_a11y_unlock_to_homescreen.py on TBPL
Revert "Bug 973443 - [settings] refactor Display panel with AMD pattern" for intermittent test failures

This reverts commit e1d028cb91ad1f05ddb6fcfff411369e21074280.
Bug 1024387 - [Collection App] Basic background support for Collection icons
bug_1020961 fixes
bg checksum