Oh, because you mentioned "several failing marionette tests", but didn't say which and how they failed, so I though it may be the tests which would fail even with the clean Gaia (re-cloned from master, without my patch), which I mentioned at the comment #11 on Bugzilla. So I make a test to confirm that.

If the tests you mentioned is the search's app tests, I may started to fix it. But I must mention again, that the test **would fail even with clean Gaia** (yesterday), which I had re-cloned it from mozilla-b2g and run it manually on my local console. So the test seems irrelevant with my LockScreen patch. (Of course I can survey on that, but you know, to fix a irrelevant test that even failed with clean Gaia is really bad).