Merge "Fix softkeymaster EC group memory leak."