Merge pull request #2614 from sebv/master

Fixed testapp/basics tests + upgraded uiauto
fixed tests