Merge "cnss2: Assert for recovery if there is already a recovery going on"