Bug 948415 - Make mock_contact.py pythonic, make
insert_contact convert it to mozcontact API
friendly format. r=dhunt r=zcampbell
Bug 966865 - Update pdf.js to version 0.8.997.
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 968996 - Bump gaiatest to 0.21.5, r=zac
Bug 968703 - Migrate code snippet for wapppush customization from applications-data.js to apps/wappush/build/build.js
Merge pull request #16074 from timdream/build-appdata-wappush

Bug 968703 - Migrate code snippet for wapppush customization, r=yurenju
Merge pull request #15700 from gentlefolk/948415

Bug 948415 - Make mock_contact.py pythonic, make insert_contact convert it to API-friendly format
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 969299 - Investigate intermittent fail in test_add_photo_to_contact.py
Merge pull request #16081 from viorelaioia/bug_969299

Bug 969299 - Investigate intermittent fail in test_add_photo_to_contact....
Bug 968083 - Intermittent fail in test_import_contacts_from_sim