Merge "Respect aspect ratio overrides for desktop mode initial bounds" into main