Fix issue #1775: Selendroid doesn't wait for app-wait-activity
Merge pull request #1776 from rgonalo/master

Fix issue #1775: Selendroid doesn't wait for app-wait-activity
fix pre-launch bug (fix #1772)
and add tests
Merge pull request #1779 from jlipps/master

fix pre-launch bug (fix #1772)
Fix Android old fashion reset