Merge "Map perceptible window state per focused window" into main