Merge "Fix Heap use after free in clearkey getSecureStops"