Merge "Prevent error message on svc power reboot" into main