Merge "Fix CDM memory leak for activity context" into sc-v2-dev