Merge "graphics: replace non-const references by pointers"