Merge "Enable add/remove window manager log points" into nyc-dev