First implementation
Create XPI
Merge from master
Added different answer tracking for visible and invisible canvas