Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface"