Merge "Per-test WindowManagerService instance"