Merge "Add window and surface trace files to bug report"