Merge pull request #1390 from jlipps/master

fix appium device end callback logic (fix #1389)