Merge "C2SoftHevcDec: Use a macro to control keep threads active flag" into main