Merge "light service: mark as shutdown critical" into pi-dev