Wrap grunt test in xvfb-run.
Merge branch 'master' of https://github.com/agable-chromium/toolkit
Revert of b505c54.