am 03af2bf6: (-s ours) am 1e954441: (-s ours) Merge "DO NOT MERGE libgui:...
am 03af2bf6: (-s ours) am 1e954441: (-s ours) Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface"
* commit '03af2bf6':
DO NOT MERGE libgui: Plumb attach/detach through Surface