Merge "Reduce GPU workload of pipeline_barrier tests" into oreo-cts-dev