Merge "Fix issues in Tuner VTS Dvr testing" into rvc-dev