Merge "Add support for Wayland traces"