Merge pull request #9491 from mcirlanaru/bug_834718

Bug 834718 - [Music] Add visual feedback for current view by ... r=@dominickuo(cherry picked from commit c4ebcc10a3b3097b5245cd826599788d3b56bb7e)

Conflicts:

	apps/music/index.html
	apps/music/style/music.css
Bug 851565 - Inserting words from text prediction should keep users capitalization
Merge pull request #9971 from es92/bug-851565-keyboard-suggestion-capitalization-fix

Bug 851565 - Inserting words from text prediction should keep users capitalization
Merge pull request #9946 from ian-liu/dialer/Bug847284_remain_caller_number_on_status_bar_while_user_typing_keypad

Bug 847284 - [Dialer] During calling, select keypad and input number, and press home key, statusbar contains the number entered by the user, r=@etiennesegonzac(cherry picked from commit b60033a071db7d9af1e2da55ff6bcb8de3ed03d9)
Merge pull request #9954 from ian-liu/dialer/Bug854786_fix_touching_exsit_call_number_for_accepting_second_incominig_call

Bug 854786 - [Dialer]Accepting Incoming call when already in call is not hiding the accept/reject/ignore call option, r=@etiennesegonzac(cherry picked from commit 7878532edf5fe7b44d1889be6b736313b08cd47a)
Merge pull request #9982 from crdlc/bug-867045-v2

Bug 867045 - [Buri][Home screen]User can delete apps in Idle screen,afte...(cherry picked from commit dfd7a7c2f9f70fcda98073d0db33973f602d0199)
Merge pull request #9545 from albertopq/calllog-refactor-no-contacts

Bug 847406 - Refactor call log rendering algorithm r=etienne(cherry picked from commit a6bd75d7c26c1589cd8b6d2ea4859cde0b636cba)

Conflicts:
	apps/communications/dialer/js/dialer.js
	apps/communications/dialer/js/recents.js
Merge pull request #9848 from albertopq/call-log-remove-single-elements

Bug 873466 - Remove selected elements in the call log r=gtoroddelvalle(cherry picked from commit 22bc959a5fda94aadfb11654ad5e8eaaaaa7db6b)
merge conflict in Bug #859555
Merge pull request #9724 from mcirlanaru/bug_868001

Bug 868001 - [Keyboard] Accommodate non-latin layouts, r=@fcampo(cherry picked from commit f14df69587b597c6a1d9aa0865fe468d328c5c56)

Conflicts:

	apps/communications/ftu/js/language.js
	apps/communications/ftu/test/unit/language_test.js
	apps/settings/js/settings.js
	shared/resources/keyboard_layouts.json
Merge pull request #8757 from leob2g/Bug_853698_Device_does_not_enter_cpu_idle_state

Bug 853698 - [System] Device does not enter cpu idle state
r=vivien(cherry picked from commit 8d877e1d7341f294934f104b30683bf753d00604)

Conflicts:
	apps/system/style/wrapper/wrapper.css
Merge pull request #10000 from mcirlanaru/v1-train_bug_868001

Merge pull request #9724 from mcirlanaru/bug_868001 (cherry picked from commit f14df69)
Bug 840055 - [MMS][User Story] Message thread view r=julienw,borjasalguero

Update the Message Thread layout according to the latest specification.

Conflicts:
	apps/sms/style/sms.css
Bug 869642 - [MMS] Create Desktop Mock Messages for Media - r=borja
(cherry picked from commit ba5616e2cdca600270e246d381916bf857cd3913)

Conflicts:
	apps/sms/js/sms_mock.js
Bug 862311 - [MMS][User Story] Display attachment icon in thread

Additionally, define the thread list item HTML via a template string.
(cherry picked from commit ef4986b6c7e015a6534ada72d08e8a152af3193d)

Conflicts:
	apps/sms/js/sms_mock.js
Bug 870437 - [MMS] Update background size for working in multiple resolutions - r=borjasalguero
(cherry picked from commit d39c33351497e4a9c63c960f7bb4cb7d2c1faa28)
Bug 837994 - [MMS][User Story] Multiple recipient messaging - r=borjasalguero

Pull Request #9521
(cherry picked from commit 2e6a20d256cd79a3cf806abe01605c6446a8629c)

Conflicts:
	apps/sms/js/thread_ui.js
	apps/sms/test/unit/sms_test.js
Bug 840069 - [MMS][User Story] Message preview including size - r=borjasalguero

Pull Request #9385
(cherry picked from commit 081391ea5338351cc9ad5f03786ebdadd5246f67)

Conflicts:
	apps/sms/style/sms.css
Bug 870879 - [SMS] New composer should convert <br> to \n instead of stripping spaces - r=borjasalguero

Closes bocoup/gaia#7
(cherry picked from commit c131340c871a7c5b1182f8da0431c63da6afda4f)
Bug 870626 - [MMS] Placeholder is not in input box. Regression. - r=borjasalguero

Closes bocoup/gaia#4
(cherry picked from commit 806b332a1f4ddfa5cb20eec2746400d9f77f5275)