Merge "graphics: fix use-after-free in mapper 2.0 passthrough"