Merge "expose waitForDeviceShell in ITestDevice"