Bug 989880 - [Keyboard] Make demo keyboard not reflow on any key presses. r=janjongboom
Bug 992194 - Fixing a small css issue caused by a merge conflict.
Bug 990998 - Use correct object scope when calling _doSetRadioEnabled

Some code path to call this._doSetRadioEnabled() is not referring to the
correct object, this making the call to fail with 'this is undefined'.
Bug 989087 - Fix layout manager height
Bug 991490 - [email/backend] persistent test failure in test_compose_blobs.js due to undefined/null inconsistency in smtp/account.js. r=mcav

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/298
Merge pull request #18017 from asutherland/email-fix-compose-blobs-test

Bug 991490 - [email/backend] persistent test failure in test_compose_blobs.js due to undefined/null inconsistency in smtp/account.js. r=mcav
Merge pull request #17981 from etiennesegonzac/bug-992194-window-css-merge-conflict

Bug 992194 - Fixing a small css issue caused by a merge conflict. r=alive
Merge pull request #17895 from lissyx/bug990998

Bug 990998 - Use correct object scope when calling _doSetRadioEnabled r=alive
Merge pull request #17874 from alivedise/bugzilla/989087/attention-screen-invade-app-height

Bug 989087 - Fix layout manager height, r=timdream
Merge pull request #17836 from DouglasSherk/989880-demo-keyboard-reflow

Bug 989880 - [Keyboard] Make demo keyboard not reflow on any key presses, r=timdream
Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts