modifications to use uiautomator so that things work properly