Merge "Add a graphics owner for graphics.h."