Merge "Follow supportlib changes in SliceManager" into pi-dev