Merge "Consider only external displays as pending" into main