Merge "C2SoftAomEnc: Fix onStop() implementation" into main