Same annotations in different places depending on view (related to odd media asset size possibly?)

[MarkF]

@ACWadmin1 cross-posting here that WB-1634 fix has been deployed (from the post that was split out from this one).