Merge "Remove framebuffer_target" into oc-dev