Merge "Fix Display SurfaceControl leak" into rvc-dev