Merge "Use correct actor string for OverlayableInfo"