Merge "Fix ST recognition requested after start error" into udc-dev