Merge "Revert "libgui: Plumb attach/detach through CpuConsumer""