Refactor code for annotations
Do not show appearance stream for text annotations
Merge pull request #2988 from mduan/annotation-refactor-tx

Refactor annotation code