Merge "Use a status_t return type for GL functors"