Merge "Internal cleanup of window manager"