Merge "Fallback to default aspect ratio if not provided" into 24D1-dev