Merge "Update UiAutomator imports" into main