Merge "Add a WAIT_FOR_GPU_COMPLETION option"