Merge "Add and revise traces in window manager"