Merge pull request #8528 from davidflanagan/bug829339

Bug 829339 - reject mp4 files with codecs other than mp4a r=dkuo(cherry picked from commit 02b6024d4027bfce066247077216eae0cd914d73)
Merge pull request #8419 from EverythingMe/testability

[Bug 845828] Make code testable [r=crdlc](cherry picked from commit 06347c52501b851895ebd76abcbead63de1c1eff)
Merge pull request #8189 from rnowm/sms-count

Bug 841310 - [SMS] Move the SMS counter to the top of input field(cherry picked from commit 093be7423b47154599cda40acd917d2b7175427c)
Merge pull request #8514 from alivedise/bugzilla/848006_master/muted-alarm

Bug 848006 - Check alarm screen visility again, r=timdream(cherry picked from commit 0bee8fb8d6f7c321e5cc3d79b26e539ac9c4f04e)
Merge pull request #8261 from alivedise/bugzilla/827281/adjusting-ringtone-selection

Bug 827281 - Adjusting preview audio, r=timdream(cherry picked from commit 0cf2ec6d375ba8d5a9b53f3238538c34eb78e64f)
Merge pull request #8534 from yurenju/bug-829104

Bug 829104 - modified css for visual spec, r=etienne(cherry picked from commit 107ab2b90c6395f43f59177f8c310d7272f6695a)
Merge pull request #8503 from daleharvey/834620-camera-lazy

Bug 834620 - Lazy load camera resources until preview starts. r=vingetun(cherry picked from commit 1f7dbc2534914620ba05126e99eb47991de758e6)
Merge pull request #8614 from crh0716/833941

Bug 833941 - Do not break lines. r=asuth(cherry picked from commit 22dec4d8034e1fab8a562cb0cd2944adbe8dcdf7)
Bug 840455 - optimize JS only in production builds r=vingtetun

- turn off the aggregation in non-production and debug builds
(cherry picked from commit 277b3c191a02e8c8b2c5d33e433b8f00831b5dcb)
Merge pull request #8480 from davidflanagan/bug846220

Bug 846220 - don't leave edit mode when handling the browse activity r=jhylands a=tef+(cherry picked from commit 28276e469cb7f9ee8abdb09fe84189bb9898f2f7)
Merge pull request #8522 from lodr/bug-848730-fix-transitions

Bug 848730 - Implementing fade in / fade out for reset confirmations.
Cause r+(cherry picked from commit 2874c6a3b812664ff113ecec55e92485615c1d51)
Merge pull request #8327 from dominickuo/bug-844029-followup

Bug 844029 - [music] use Makefile and .gitignore to concatenate JS scripts, r=djf(cherry picked from commit 2a1e50d4ccdeb4fc752e2ace8e487a5a17d1e113)
Merge pull request #8219 from mozsquib/email-folder-sort

Bug 829520 - [Email] Folder sorting breaks the displayed folder hiearchy(cherry picked from commit 2ebf7c3cc1addf0b46a6d7fa865c7c541c220065)
Merge pull request #8569 from dominickuo/video-support-open-activity

Bug 838655 - [video] support open activity to play videos from blobs, r=timdream, a=leo+(cherry picked from commit 31db1c11ff3ca8ab1d3510eb4bb9acb4e51e250e)
Merge pull request #8364 from albertopq/contacts-search-phone

Bug 827256 - Search by phone number r=arcturus(cherry picked from commit 32d7f344430ad72c11d54737eef589ba4dbea4d4)
Merge pull request #8504 from lightsofapollo/bug-848509-sane-event-time-handling

Bug 848509 - Fix time editing when timezones are involved r=kgrandon(cherry picked from commit 39c02826aec761f3f91bb1a04b68505e5e4b6ab1)
Merge pull request #8520 from gtorodelvalle/dialer-bug-848699-asterisk-and-sharp-key-position

Bug 848699 - [Dialer. UX VD] Alignment of * and # on dial pad should be left as the numbers (r=basiclines).(cherry picked from commit 3aa31b5a83b3955925686c5bf58a0b8cdf876a99)
Merge pull request #8507 from gasolin/issue-828968

Bug 828968 - Need icons for homescreen and system app, r=alive(cherry picked from commit 3f9b4e1cbcacea7192489e27ca4e7926b0485e98)
Merge pull request #8265 from dominickuo/music-performance-tuning

Bug 844029 - [music] Hide all pages before startup and lazy load Player.js, r=djf(cherry picked from commit 41035e8e2dbdbfe60c7df3c0b362544393d69190)
Merge pull request #8508 from leob2g/Bug_847817_Datalimitinput_Wrong_Cursor_Position

Bug_847817 [Cost Control] Datalimitinput_Wrong_Cursor_Position r=lodr
Cause r+(cherry picked from commit 4ce2203b37be7c94aeb3602f9af76b0815ad037a)