Merge "Add null check for slot to avoid phone process crashes." into pi-dev