Merge "Fix build" into graphics-dev