Merge "Avoid deadlock during boot up" into rvc-qpr-dev