Merge "Fix leak where system held onto slice providers" into pi-dev