Merge "Unlock screen before test runs." into tm-dev