Merge "Start window manager refactoring."