Merge "Make per-display focus optional (1/2)"