Merge "Add window manager tracing"