AndroidTracker updated (updated thread handling)