Merge "Fix selecting focused stack with secondary displays"