Merge "Fix memory leak in Ringtone" into cw-f-dev