Merge "libgui: Plumb attach/detach through Surface"