Merge "Shell command to toggle sandboxing" into sc-dev