Merge "Fix UiAutomation to correctly wait for idleness"