Merge "Do not depend on actual WindowManagerService object."