Merge "Move last focused stack from global to per-display"