Bug 942460 - [Contacts] Implement position:sticky for fixed headers r=bkelly
Bug_922609_Provide a way for tests to determine that the video app has finished scanning
Bug 933542 - Added special characters to Slovak keyboard
Bug 968276 - 300ms startup time regression in v1.3 branch Usage app
Bug 923449 - SV: Network Display Indicator customization by SIM
Bug 960473 : Fix ReadNdef Issue when using Connect()
[B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
[B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
Bug 964927 [B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image - merge
Bug 942199: Allow minimum EXIF preview size to be configured at build time for Camera and Gallery
(cherry picked from commit e439f8630fdea790595efaebab24ec21be6bc0e4)

Conflicts:

	apps/camera/js/filmstrip.js
Bug 969193 - ][Cost Control] The string "OK" is not localizable when launching cost control with a locked SIM

Button is using a non existent string ID. Existing string with id “ok”
seems to be unused in other contexts.
Bug 968737 - Update test_unlock_to_camera_with_passcode to take a picture
Bug 968465 - [Settings] Auto show/hide developer settings with pref.
Merge pull request #15886 from ltedone/Bug_933542-Slovak_keyboard_is_missing_the_special_characters_master

Bug 933542 - Added special characters to Slovak keyboard. r=janjongboom
Bug 964927 fixing jslint issue
Merge pull request #16062 from russnicoletti/bug964927

Bug 964927 [B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
Merge pull request #16063 from davidflanagan/bug942199

Bug 942199: Allow minimum EXIF preview size to be configured at build ti...
Merge pull request #14292 from KevinGrandon/bug_942460_contacts_position_sticky_headers

Bug 942460 - [Contacts] Implement position:sticky for fixed headers
Bug 968702 - Add Makefile for wallpaper app
Merge pull request #16060 from svic/Bug_960473

Bug 960473 : Fix ReadNdef Issue when using Connect()