Merge "Track focus changes on external displays (1/4)"