Merge "system server watchdog caused by deadlock" into rvc-qpr-dev