Merge pull request #7855 from davidflanagan/bug834957

Bug 834957 - optimize first mediadb scan
Merge pull request #7900 from daleharvey/camera-performance

Bug 833104 - Dont block the camera preview from loading during initialis...
Merge pull request #7758 from borjasalguero/sms_unit_tests

Bug 828476 - [SMS] [Tests] Add unit-tests to SMS App r=arcturus r=fcampo
Bug 833010 - [SMS] [Edit mode] Receiving a SMS while edit-mode it's not working properly r=etienne
Merge pull request #7922 from dominickuo/bug-833247

Bug 833247 - [camera] Hide filmstrip after Camera starts recording
Merge pull request #7909 from etiennesegonzac/map-removal

Bug 829037 - Stop using MozAfterPaint in gaia and disable the pref.
Merge pull request #7932 from dhylands/dhylands-837001

Bug 837001 - Disable remote debugging by default. r=fabrice

This goes along with bug 836973 which has landed on m-c, b2g18 and v1.0.0
Merge pull request #7890 from lodr/bug-836234-not-available

Bug 836234 - Disabling former-legacy optimization interfering with the new way of painting UI.
Cause tef+ and r+
Merge pull request #7930 from vingtetun/836569

Bug 836569 - [Lockscreen] Lots of overlap on lock screen when there are ...