Bugfix in addActivityToStack and improved waitForActivity
Removed if statement in setUpActivityStackListener