Merge "Wake up/unlock device before running tests"