Merge "Rename currysrc AddAnnotation to AddMarkerAnnotation"