Merge "Wait for all destroying activities to kill task process" into main