Merge "Support a ring buffer or a queue to store window manager traces"