Merge pull request #14526 from gasolin/issue-948283

Bug 948283 - [BB][refactor] host in single style folder, r=arnau
Bug 950623 - [Messages] Multi-recipient. Back button is kept as pressed after going back from recipients details list
Merge pull request #15509 from steveck-chung/bug-950623

Bug 950623 - [Messages] Multi-recipient. Back button is kept as pressed after going back from recipients details list. r=julienw
Merge pull request #15526 from steveck-chung/bug-961231

Bug 961231 - [B2G][SMS]To: Text field’s subtext region is truncated. r=julienw
Merge pull request #15476 from hfiguiere/bug917717-2

Bug 917717 - Part 2: use the prebuilt ffi. r=gaye
Bug 957497 - Enable alignStoredFiles()
Bug 935991 - [Messages] Added new test for Delete menu option
Bug 930607 - The phone number is emptied even when the call can't be made
Bug 951337 - SIM PIN dialog not showing up on bootup

- add test
- delay init sim_lock
Bug 959053 - [settings] add marionette test for battery panel
Bug 956893 - [B2G][Contacts][Facebook] Unable to log out from Facebook in Contacts
Merge pull request #15531 from svic/Bug_960790

Bug 960790: Fix P2P presence discovery handling.
Merge pull request #15405 from EragonJ/bug-951337-another-try

Bug 951337 - SIM PIN dialog not showing up on bootup
Merge pull request #15542 from darkowlzz/BUG957927

Bug 957927 - b2g.neterror.url value set in Gaia build script r=@yurenju
Merge pull request #15525 from etiennesegonzac/bug-961635-lockscreen-alt-camera-click

Bug 961635 - Listen to click instead of touchstart on the lockscreen (with code) camera button r=gweng
Merge pull request #15541 from darkowlzz/bug-930607

Bug 930607 - The phone number is emptied even when the call can't be made. r=etienne
Merge pull request #15528 from EverythingMe/bug-948195

Bug 948195 - Marketplace is incorrectly listed in the Games bubble in th...
Bug 948195 followup - compress new PNG files
Merge pull request #15556 from EverythingMe/bug-948195

Bug 948195 followup - compress new PNG files
Bug 925566 -A preloaded contact without a type specified for a phone number defaults to mobile, even though mobile isn't the defined type