Restarting B2G before running tests, unlock screen improvements

nit: move binary operator up one line