Merge "More logs for UiAutomation"