Merge "Update size constraints on aspect ratio change" into main