Merge "Move shell check to ShellCommand from system-service" into main