Merge "Only enforce max width for non-initial requested display size" into main