Merge pull request #11522 from steveck-chung/Bug-898726

Bug 898726 -[SMS]Manual inputed receiver's phone number will be overrided after select receiver from contacts. r=julienw
(cherry picked from commit 2f62e3aaa1e8421e0d8e536d2b61fa69fb1bd983)
Merge pull request #11714 from alivedise/bugzilla/904525/voicemail-number

Bug 904525 - Fetch voicemail number from settings DB before looking up navigator.voicemail.number, r=alive, a=leo+
(cherry picked from commit 72d9989f759099632c3d3b8b5335b7d12d969d2f)
Merge pull request #11790 from mikeaich/bug831446

Bug 831446 - remove delete button from secure lockscreen camera, r=djf
(cherry picked from commit b28199689da4e6d0ed11c584cff09ba2c1666399)
Bug 890427: use camera API's onPreviewStateChange callback to avoid deadlock. r=johu

do the same thing in loadCameraPreview
(cherry picked from commit 376d45c7afdbf97f75d55803e15fbb87931f3a50)

Conflicts:

	apps/camera/js/camera.js
Merge pull request #11821 from davidflanagan/bug890427-v1-train

Bug890427 v1 train
Merge pull request #11215 from huchengtw-moz/settings/Bug_897918_settings_app_should_use_hi-res_image

Bug 897918 - Settings app should use hi-res icons on hd phones, r=arthurcc(cherry picked from commit 4c744eafa32a80a890d9d93b8ac5ef6198797880)

Conflicts:
	apps/settings/js/apps.js
Merge pull request #11834 from huchengtw-moz/settings/Bug_908628_v1-train

Bug 908628 - App permission icons are blurry for some marketplace apps
 this patch is uplift from Bug 897918 which is r=arthurcc