Merge "External display limit on ready to enable" into main