Fix for ComponentMovementWatcher with top-level windows.