RED-36519 Managed to get callbacks for icon overlays working, fixed some additional threading issues