Merge "Fix potential use-after-free bug in reboot" into rvc-dev