Merge "Fix init watchdog timeout due to a held lock" into udc-qpr-dev