Merge "bufferhubd: Implement more DetachedBuffer logic" into pi-dev