Merge "Check if the supervision service is null before calling it in SupervisionManager." into main