Merge "Move up caller's display and window validation" into main