Merge "Fix unintended deletion of reused weaver slots during user removal" into pi-dev