Merge "Add shell command to enable/disable trace." into sc-dev