bugfix, context was wrong
Added timeout to uninstallApk
test fixes
Merge pull request #2033 from sebv/various-fixes

Various fixes