Merge "Add "cmd window trace save-for-bugreport"" into sc-dev