Merge "gltrace: attach contents of the appropriate framebuffer"