Merge "Refactorings for Window Manager module."