Merge "Update to latest trace-viewer"