Merge "Only apply offset to the current window" into main