Callout: fixed issue where adding it again wouldn't re-add the touch listener
Merge branch 'v2.0.x'