Merge "Refactor local window manager implementation."