Merge "Fix ScannerMap leak"