Merge "Improve some issues around position and window order"