Merge "Remove unnecessary references in WindowManagerService"