Bug 903491 - [HD][Browser] Refresh icon appears to be in SD
Merge pull request #11144 from huchengtw-moz/video/Bug_897216_video_app_plays_video_in_wrong_direction

Bug 897216 - [video] Video app plays videos recorded by the camera sidew... r=davidflanagan(cherry picked from commit 58c18428ed00d21d5b4105049c14c7ecc56b5f81)

Conflicts:
	apps/video/js/view.js
	apps/video/style/video.css
Merge pull request #11280 from huchengtw-moz/camera/Bug_897356_2_camera_cannot_work_when_plug_out_usb

Bug 897356 - [Buri][Contacts][Camera]The camera can't work when plug out...(cherry picked from commit ddfcdd7c9f202b242ffd31d1796d6607519da4a7)

Conflicts:
	apps/camera/js/camera.js
Bug 809093 - [UX VD] Settings. The list should have shorter horizontal dividers
Bug 907122 - The notification lock should be released in all conditions.
Bug 909718 - Add gaia endurance tests
Merge pull request #11771 from ian-liu/bluetooth/Bug905944_confirm_receiving_file_while_storage_is_not_available

Bug 905944 - [Bluetooth] Connection would hang after sent a file to a FXOS phone without sd card, r=@alivedise(cherry picked from commit 4bcdef86ceaec7d2807d3ec0535529c602c86b58)
Merge pull request #11765 from davidflanagan/bug908941

Bug 908941: add a latin version of the Serbian auto-correct dictionary r=RudyLu(cherry picked from commit 0bab727b8f537ab6a64fdeb6ad8993d8df0d1041)

Conflicts:

	dictionaries/Makefile
Merge pull request #11801 from davidflanagan/bug908941-v1-train

Bug908941 v1 train
Bug 906536 - [Homescreen] Big icons are overlaped over normal icons
(cherry picked from commit f470297e75e4691fe18a2a4db894a4185e5ddb78)
Merge pull request #11661 from EverythingMe/migrate-storage-1.0.1-1.1

[Bug 907160] data migration from 1.0.1 to 1.1 [r=crdlc]
Merge pull request #11780 from davehunt/gaiatest-v1-train

Bug 909718 - Add Gaia endurance tests (v1-train)
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 #11823 from steveck-chung/hd-merge

Bug 898726 - [SMS]Manual inputed receiver's phone number will be overrided after select receiver from contacts. r=julienw
Merge branch 'v1-train' into v1.1.0hd

Conflicts:
	apps/camera/js/camera.js
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