Merge "sdm: Fix memory leak in connector modes"