Bug 924846 - [Keyboard][V1.2] Selected keyboard cannot be displayed while switching the keyboard between built-in keyboard and third party keyboard
[Bug 914591] make sure sessions get re-inited after expiration [r=ranbena]
Bug 929840 - [Settings] Use CSS for fake select elements
Bug916183 - Fix of Done button target is off
bug 930469, malformed properties file.
Remove leftover merge conflict marker
Bug 917732 - [Keyboard] Candidate panel displays wrong data when clicking candidate-panel-toggle-button and space key at the same time
Bug 927783 -  [Messaging][Forward] Per message context menu opens options/action menu (to incl. delete, forward) r=schung,rwldrn
Revert "Merge pull request #13097 from dmarcos/bug928614"

This reverts commit 4c652c5ca43f301217cbabf8f781b93a860bec37, reversing
changes made to afbf45f26a73b7cd5e0a831bea48087331975286.
Merge pull request #13100 from lightsofapollo/revert-4c652c5

Revert "Merge pull request #13097 from dmarcos/bug928614"
NO BUG - vbump marionette a=test-only
Merge pull request #13101 from lightsofapollo/vbump-marionette-1.0.0

NO BUG - vbump marionette a=test-only
Merge pull request #12935 from borjasalguero/uk_v1.2_sprint3_forward

Bug 927783 - [Messaging][Forward] Create action panel for deleting/forwa...
Bug 929813 - [Settings] Split up about.js and add declaration for subpanel dependencies
Merge pull request #13057 from KevinGrandon/bug_922658_settings_subpanel_about

Bug 929813 - [Settings] Split up about.js and add declaration for subpanel dependencies r=arthurcc
Bug 931054 - [Camera] filmstrip.js tries to access undefined preview metadata
Merge pull request #13107 from dmarcos/bug931054

Bug 931054 - [Camera] filmstrip.js tries to access undefined preview met...
Merge pull request #12293 from luke-chang/917732_multitouch_on_candidate_panel

Bug 917732 - [Keyboard] Candidate panel displays wrong data when clicking candidate-panel-toggle-button and space key at the same time, r=rudylu
Bug 930545 - Re-enable test_browser_bookmark.py
Merge pull request #12993 from punamdahiya/Bug916183

Bug916183 - Fix of Done button target is off r=alive
Bug 928281 - Add a setting entry to enable keyboard app run as Out-of-Process (OOP)