Merge "Fixed camera performance tests runner on Q"