Merge "Fix scan volume crash" into rvc-dev