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 876003 - [MMS] Sending mms to unknown contact via activity will lose the number - r=gnarf

Closes gh-9996

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit fc32391128052b42416427cc2a2c061150210c70)
Merge pull request #10093 from dominickuo/bug-877313

Bug 877313 - [music] Remove Math.floor() on the audio duration, r=djf(cherry picked from commit 204025be379064233596eadb08f6766c029bcbbf)
Merge pull request #10120 from asutherland/email-html-attribs-sans-spaces

Bug 873702 - [Email] HTML tags containing attributes without separating/delimiting whitespace will be emitted as text by the HTML sanitizer (bleach.js). r=daleharvey(cherry picked from commit e73419a5353fedaa44bba4a03dcc6902098c250e)
Merge pull request #9641 from mcirlanaru/bug_857832

Bug 857832 - [Music] Normalize search queries for songs with accented... r=@RudyLu(cherry picked from commit 55b3f1629e0ea673b1d38b8b30274880264b7cf8)
Merge pull request #10136 from davidflanagan/bug875641

Bug 875641: update MediaDB and Gallery to handled SD card removal and sharing when there is also internal storage r=dhylands(cherry picked from commit b51af7558dd9e39da536ad77e975f3a3ab866d36)
Merge pull request #10137 from davidflanagan/bug875641-v1-train

Merge pull request #10136 from davidflanagan/bug875641
Merge pull request #10056 from davidflanagan/bug870327

Bug 870327: fix crash if sdcard is pulled while music is playing r=dkuo(cherry picked from commit e6b05b52f421c6122a31e9167cdeeb80d227d290)
Merge pull request #10138 from davidflanagan/bug870327-v1-train

Merge pull request #10056 from davidflanagan/bug870327
Merge pull request #10141 from davidflanagan/bug878326

Bug 878326: do not crash when removing sdcard during video playback. r=daleharvey(cherry picked from commit 2a14bc6bf94d8985c5ba995130a4f55135e336a4)
Merge pull request #10145 from davidflanagan/bug878326-v1-train

Merge pull request #10141 from davidflanagan/bug878326
Bug 860605 - [Email/IMAP] Initial synchronization is too conservative on time windows, especially when the folder has a small number of messages. rs=squib

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/215
Bug 826071 - Notify user when they receive new emails
Bug 876597 - Disable the power button when the airplane mode is on
Bug 871450 - [Email] Cached contact info is not automatically updated by notifications from the mozContacts API; stale info can be shown. r=squib
Merge pull request #9865 from EverythingMe/bugfix-banner-design

[Bug 873843] disable CSS rset on banner element [r=crdlc]
Merge pull request #9084 from EverythingMe/bugfix-no-more-more

[Bug 860230] Fix "More" menu when there are no more suggestions [r=crdlc](cherry picked from commit 57ff1b0d55a0b3a6edb64e18c56d181d9b93cecf)

Conflicts:
	apps/homescreen/everything.me/js/Brain.js
Merge pull request #9700 from EverythingMe/update-smart-folder-icon

[Bug 871244] Auto update smart folder's icon [r=crdlc]
Conflicts:
	apps/homescreen/everything.me/modules/Apps/Apps.js
Merge pull request #10017 from EverythingMe/separator-line

[Bug 876363] fix separator line styling [r=crdlc]
Conflicts:
	apps/homescreen/everything.me/modules/Apps/Apps.css
Merge pull request #10004 from EverythingMe/async-storage

[bug 876237] E.me async storage [r=crdlc]
Conflicts:
	apps/homescreen/everything.me/js/Brain.js
	apps/homescreen/everything.me/js/api/DoATAPI.js