Merge "Use display of parent window if available" into main