Bug 1112700 - Fix assertion failure: aPropID != eCSSPropertyExtra_variable r=me
Bug 1109149 - Display a basic error to the user if Loop room creation fails. r=nperriault
Merge mozilla-central to fx-team
Bug 1108254 - fix hidpi icon in search, r=felipe

--HG--
extra : rebase_source : 764162314dc48b0a7669ebe41bfe58cd40dca062
extra : amend_source : 70bf1cb729cd114495f1a7fad40961e2c9801e01
Bug 1101287 - fix browser_934951_zoom_in_toolbar.js to use a mutation observer to wait for a label change, r=adw
Bug 1109032 - Fix the activity so audio only calls from received links work. r=mbanner
Bug 1097703 - Enable install/open FxOS Loop client from standalone UI for ROOM. r=mbanner
Bug 1111518 - Fix the logic in MediaDecoder::CanPlayThrough(). r=jwwang
Bug 970307: Part 1: Report status of each thread to find when all the threads are idle. r=nfroyd
Bug 970307: Part 2: Let Nuwa wait for all tasks of preload slow things to finish. r=cyu
Bug 970307: Part 3: Reinitialize modules after fork. r=fabrice
Bug 970307: Part 4: Increase leak checking threshold. r=nfroyd
Merge mozilla-central to mozilla-inbound
Bug 938034 - Add GonkCameraImage format. r=roc
Bug 938034 - Enable gonk camera recording callback. r=roc
Bug 1100206 - Teach the parser about the integrity attribute. r=hsivonen
Bug 1109486 - Unconditionally use UTF-8 as default Charset. r=smaug
Bug 1109486 - Mochitest test case. r=smaug
Bug 1109704 - Expose details settings informations in about:memory. r=qdot

We want to have a better breakdown of how many get/set operations we are
doing for each setting lock. Given that we keep track of all locks, this
may consume quite some memory, so we introduce a new preference to
enable this feature. We also add memory reporting for the SettingService
lock.
Bug 1112170 - allow the basic compositor backend to use tiling. r=Bas