Merge "Fix incorrect header highlight when in single-pane."