Merge "Make DimLayer track changes to WindowState layer."