Restarting B2G before running tests, unlock screen improvements

The user story is confusing!