Merge "Make sure VRI waits for SV to draw before report" into tm-dev