Merge "Add traces for window manager and activity manager." into jb-dev