Merge "Prevent smartspace from disconnecting during rebuilds" into main