Merge "Fixing Video perf test" into klp-dev