Support border for link annotations

This depends on PR #2988.