Merge branch 'vbap_cleanup_rend_fixes' into 'main'

Clean-up for intermediate in vbap and fix for renderer failures

See merge request !138