Merge "Fix OWNERS for graphics"