Bug 1074688 - Part 1 Rename the existing EmptyRoomView to be DesktopRoomView, and clean it up, in preparation for the Loop room view implementation. r=nperriault
Bug 1080801 - lump context-menu abusing m-bc tests together, rs=comment-only
DONTBUILD because comments-only

--HG--
extra : rebase_source : cb329f0e5fdc95d8cf3e72749de424432c33b9ae
Bug 1086981 - Part 5: Cancel editing mode when pressing the tabs panel button. r=lucasr
Bug 1086981 - Part 6: Drop keyboard when clicking the menu button. r=lucasr
Bug 1091531 - Don't refresh sidebar state in new tablet UI (r=mhaigh)
Bug 1080801 - update comments for notification-related tests, rs=comments-only
DONTBUILD because comments-only change.

--HG--
extra : rebase_source : 31a1f72d65d77b9fd3fca975cdb458b98791d4b2
Bug 1093056 Scrollbars shouldn't be shown in the room list by default. r=nperriault
Bug 1080466 - Implement resolveOrTimeout in PromiseUtils.jsm. r=yoric
Bug 1092451 - Ensure waiting for frames button update before resolving toolbox.open. r=past
Bug 1080801 - update more test comments for disabled tests, rs=comments-only
DONTBUILD because comments-only

--HG--
extra : rebase_source : 2112abac16ed3047753e9b6355697388b3a1e9e9
Bug 1055606 - Animate tab strip when tabs added added or removed (r=mcomella)
Bug 1091673 - Use FadedTextView in new_tablet_tabs_item_cell.xml (r=lucasr)
Bug 1093394 - Move new_tablet_tabs_item_cell.xml into a tablet resource directory. r=lucasr

--HG--
rename : mobile/android/base/resources/layout/new_tablet_tabs_item_cell.xml => mobile/android/base/resources/layout-v11/new_tablet_tabs_item_cell.xml
Bug 1086958: move new notification bar implementation of the default browser prompt behind a pref, revert to old modal dialog implementation, r=dao

--HG--
extra : rebase_source : 85d09b7b6e25d84aa3ba5615aba7f09f1c2f6394
Bug 1091901: fix tracking protection UI icon for hidpi, r=gijs

--HG--
extra : rebase_source : d8c1e94fa80a3bed1f9ecb0edb93166b04dc2112
Bug 1092808: fix issue with polaris pref observer being registered too early (causing polaris prefs to be reset on restart), r=dolske

--HG--
extra : rebase_source : 5c87b94f621f3bc3c91c9fd918e58de6676c7eb2
Bug 1086221 - Increase close button hit area in tabs panel (r=lucasr)
Bug 1071505 - use constant GUIDs for Places roots. r=mano
Bug 1071505 - use constant GUIDs for Places roots (test changes). rs=mano

--HG--
rename : toolkit/components/places/tests/migration/places_v6_no_frecency.sqlite => toolkit/components/places/tests/migration/places_v6.sqlite
rename : toolkit/components/places/tests/migration/test_current_from_v10.js => toolkit/components/places/tests/migration/test_current_from_v16.js
rename : toolkit/components/places/tests/migration/test_database_from_v6_no_frecency.js => toolkit/components/places/tests/migration/test_current_from_v6.js
Bug 1093374 - Use -moz-appearance: none on TabToolbar to preserve custom background with tab overflow and tabs outside titlebar on OSX;r=dao