Fixes an annotation tile-color bug. Fixes an expanded-state border-tile calculation bug.