Merge "Improve debugging setup for window manager package."