Merge "Added more log points for add/remove in window manager." into nyc-dev