Merge "Update a Slice Uri when unavailable" into pi-dev