Uiautomator selector update, fixes #2264