Bug 943881 - Add camera=true tag to test_sms_with_attachments.py
Bug 944274 - The self.lockscreen.is_locked is True when user unlock from lockscreen to camera with passcode
Bug 944575 - When exporting a local contact to SIM save the iccContactId in order to align with bug 943234
Bug 943844 - [v1.2] Intermittent failures of test_browser_bookmark.py on Travis on v1.2
Merge pull request #14201 from timdream/keyboard-disable-install

Bug 944295 - Uninstall the input app when the feature is not enabled, r=gchen
(cherry picked from commit 00b3f8e781ce8d721c50ea7015010b67dba69c2a)

Conflicts:
	apps/system/test/unit/mock_keyboard_manager.js
Merge pull request #14241 from mcjimenez/bug944495

Bug 944495 - Race condition when installing single variant apps(cherry picked from commit 573304f58bb431c3622a86786b5e17aaa65b07b9)

Conflicts:

	apps/homescreen/js/configurator.js
	apps/homescreen/js/grid.js
Merge pull request #14456 from mcjimenez/bug944495_12

Merge pull request #14241 from mcjimenez/bug944495. Rebased for v1.2
Merge pull request #14407 from bebef1987/944274_1.2

Bug 944274 - The self.lockscreen.is_locked is True when user unlock from...
Merge pull request #14406 from bebef1987/v1.2

Bug 943881 - Add camera=true tag to test_sms_with_attachments.py
Bug 945261 - [v1.2] Investigate intermittent fail in test_cards_view_launch_app.py
Merge pull request #14231 from bobsilverberg/bb

Bug 943844 - [v1.2] Intermittent failures of test_browser_bookmark.py on Travis on v1.2
Merge pull request #14460 from viorelaioia/bug-945261

Bug 945261 - [v1.2] Investigate intermittent fail in test_cards_view_lau...
Merge pull request #14412 from jmcanterafonseca/fix_sim_export

Bug 944575 - When exporting a local contact to SIM save the iccContactId...
Bug 945376: correctly handle the None alert tone setting
(cherry picked from commit 19dba5709ee860750765636f298889bf1441d083)
Merge pull request #13887 from davidflanagan/bug939962

Bug 939962: attempt to reduce memory requirements for saving an edited i...(cherry picked from commit 08d96ee9678bef48a4540470ed96d32e962ff557)
Merge pull request #14474 from davidflanagan/bug939962-v1.2

Merge pull request #13887 from davidflanagan/bug939962
Merge pull request #14475 from davidflanagan/bug945376-v1.2

Bug 945376: correctly handle the None alert tone setting
Bug 945284 - Bump gaiatest version to 0.20. r=dhunt