Merge "Fix OverlayInfo API"