Merge "graphics: keep mapper valid during process termination" into oc-dev