Merge pull request #17958 from gitmai/bug-986358-rebase-1.3

Bug 986358 -[Sora][IOT] Not SIM inserted message appears when SIM is alr...
Merge pull request #17897 from arcturus/bug-990496

Bug 990496 - [Contacts] Error when user tries to cancel importing contacts
Merge pull request #17955 from justindarc/bug991813

Bug 991813 - [Camera] Zoom Bar jumps on orientation change
Merge pull request #17928 from justindarc/bug991354

Bug 991354 - [Camera][Madai] X in cancel button not centered. Pick activ...
Merge pull request #17303 from nullaus/bug982006

bug 982006(cherry picked from commit 288c8763265aa98c16c8b79cddaf37c3dd34d2a2)

Conflicts:
	apps/system/test/unit/app_modal_dialog_test.js
Merge pull request #17987 from nullaus/v1.4

Merge pull request #17303 from nullaus/bug982006
Merge pull request #17867 from RudyLu/keyboard/Bug990372

Bug 990372 - [Sora][Message]The virtual keyboard disable after do some
r=janjongboom(cherry picked from commit 73c00d27db9835c82c92fbb03578f7ad177a2932)
a=v1.3+, bajaj
Bug 985498 - Disable intermittent failing test, test_homescreen_delete_app.py
Bug 988445 - [AirplaneModeHelper] getStatus method does not return rightly

Conflicts:
	apps/costcontrol/js/app.js
	apps/costcontrol/js/widget.js
Merge pull request #17803 from jmcanterafonseca/export_bday_vcard

Bug 989909 - vcard Export / Import does not deal with birthday and anniv...
Conflicts:
	apps/communications/contacts/test/unit/contact2vcard_test.js
Merge pull request #17973 from wilsonpage/bug/990606

Bug 990606 - [Camera][Madai][l10n] Improve l10n for Camera Settings
Merge pull request #17993 from wilsonpage/bug/991344

Bug 991344 - [B2G][Contacts][Camera]Unable to attach image from camera to contact because camera never loads
Merge pull request #17707 from sergi/978696

Bug 978696 - [Sora][Contacts] The vCard exported from Soul 3.5 FF can not be imported into Android devices.
Conflicts:
	apps/communications/contacts/test/unit/contact2vcard_test.js
Merge pull request #17943 from frsela/STK/Bug989852

Bug 989852 - [Sora][STK]'OK ' item is grayed when execute 'Get input' with a default text and user input command., r=vingtetun
Conflicts:
	apps/system/js/icc.js
Revert "Merge pull request #17943 from frsela/STK/Bug989852"

This reverts commit 4202bbda7118abe1f2bf22d44e6c836f2469a0da.
Merge pull request #17839 from cvan/updated-mkt

Bug 989470 - Fix MCC/MNC dual SIM detection in Marketplace app
r=julien
(cherry picked from commit 5d81c713215ee1b97996e0bedff87dcd14309eec)
Merge pull request #17214 from qdot/983507-flight-mode-radio-off

Bug 983507 - Make airplane mode icon appear via airplaneMode setting, not RIL status
Merge pull request #17655 from frsela/STK/Bug988362

Bug 988362 - [STK]The maxlength of the inputbox didn't set corretly in GET_INPUT command. (Increment wait time), r=timdream
Merge pull request #18058 from mcav/gelam-tarako

Bug 991567 - [Tarako][Email] Email app is killed while downloading an at...
Merge pull request #16014 from EragonJ/bug-962927

Bug 962927 - [DSDS] After PUK is locked, SIM manager did not show "No SI...