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