Bug 1024845 - Lockscreen Visual Refresh follow-up: Assets Swap
Bug 968619 - [Settings] add marionette test for airplane mode
Revert "Merge pull request #20532 from timdream/keyboard-modify-layout" for most likely causing a really frequent gaia-ui test failure

This reverts commit a6c97a8924e9649052e7e33878ae4d28441975fd, reversing
changes made to 2d50292b3f4f8adce0680a9cd2df76f339f55ff3.
Revert "Bug 1024993 - Update CSS xfail list to be green"

This reverts commit dade090fc3299af85a19b5930d4720c203c3e43e.
Revert "Bug 1024993 -  Run the CSS Linter in Travis/TBPL"

This reverts commit 6afc2da504ecccd4c0906a2f7fed962b0163535b.
Bug 1021481 - Handle app protocol for DEBUG=1 mode, with port change
Merge pull request #20648 from mnjul/bug_1024845_lockscreen_asset_swap

Bug 1024845 - Lockscreen Visual Refresh follow-up: Assets Swap. r=gweng
Merge pull request #20274 from EragonJ/bug-968619

Bug 968619 - [Settings] add marionette test for airplane mode
Merge pull request #20654 from shamenchens/Bug1021481-App-Protocol-3

Bug 1021481 - Handle app:// protocol for DEBUG=1, r=ochameau
Bug 1022880 - [Camera] Add focus state color to the continuous auto focus ring