Merge pull request #12740 from alivedise/bugzilla/915975/proximity-toggle

Bug 915975 - Turn on screen whenever its turned off by proximity, r=timdream
Merge pull request #12788 from jmcanterafonseca/fix_fb_dialog

Bug 925602 - [B2G][Contacts] No error message is given when a loss of da...
Bug 925677 - Xfali test_camera_multiple, test_add_photo_to_contact, test_gallery_edit_photo
Merge pull request #12760 from zacc/bug924955

Bug 924955 - Enable tests for Hamachi device
Merge pull request #12791 from zacc/bug925677

Bug 925677 - Xfali test_camera_multiple, test_add_photo_to_contact, test...
Bug 914999 - Mobile phone is not well-formed on vcard export
Merge pull request #12772 from gitmai/bug-914999-missing-mobile-number-on-export

Bug 914999 - Mobile phone is not well-formed on vcard export
Bug 924032 - ~40ms delay from app.launch to mozChromeEvent r=vingtetun
Bug 905173 - PIN code screen should not display '3 tries left.' when loading

-----------
- Changed tag to hidden
- Added tests
Bug920387 - [Gallery] - Update Wallpaper share activity to use blob instead of data URL r=davidflanagan
Bug 919882 - Use latest mozilla-central b2g build on travis
Merge pull request #12703 from EdgarChen/bug_922703

Bug 922703 - [Gaia] Refine the error handler for card lock functionality (r=fcampo)
Bump marionette-apps to ~0.3.1
Merge pull request #12777 from lightsofapollo/more-recent-b2g

Bug 919882 - Use latest mozilla-central b2g build on travis
Merge pull request #12800 from gaye/bump-marionette-apps

Bump marionette-apps to ~0.3.1 r=kgrandon
Bug 878057: allow songs to be picked as ringtones
Merge pull request #12409 from davidflanagan/bug878057

Bug 878057: allow songs to be picked as ringtones
Bug 917826 - [Clock] Use Full Line Highlights
Bug 918872 - System screen should use full highlights
Bug 908241 - [SMS] Add attachment highlight state doesn't extend to the top edge