Merge "Fix NPE in UiAutomationManager" into main