Merge "Use uiautomator_helpers to open/close screen and wait for it to settle" into main