Bug 1090408 - apps/communications/contacts/test/marionette/contacts_shortcuts_test.js permared on v2.0 r=jmcf
Bug 1083775 - [System] status-bar label is overlapped with icons if the operator text is long in 2.0
Bug 1085212: release video hardware before sharing and restore when done.
Merge pull request #25773 from gmarty/Bug-1083775-status-bar-label-is-overlapped-with-icons-if-the-operator-text-is-long-in2.0-fix

Bug 1083775 - [System] status-bar label is overlapped with icons if the ...
Bug 1084224 - [Midori 2.0][Contacts][Facebook]keep logging out interface always when clickX

Conflicts:
	shared/js/contacts/import/facebook/fb_utils.js
Merge pull request #25947 from davidflanagan/bug1085212-v2.0

Bug 1085212: release video hardware before sharing and restore when done
Revert "Bug 1084224 - [Midori 2.0][Contacts][Facebook]keep logging out interface always when clickX"

This reverts commit 71bb3c6a743d15d191b05e2d11f1eba759de7e53.
Bug 1084224 - [Midori 2.0][Contacts][Facebook]keep logging out interface when user clicks 'x' on the window
Merge pull request #26026 from jmcanterafonseca/logout_facebook_20

Bug 1084224 - [Midori 2.0][Contacts][Facebook]keep logging out interface...
Merge pull request #25586 from arcturus/bug-1090408

Bug 1090408 - apps/communications/contacts/test/marionette/contacts_shortcuts_test.js permared on v2.0 r=jmcf
Merge branch 'v2.0' into v2.0m