Merge "Revert "Fix vts cases due to function change for async render en...""