Merge "Fixed logic error with setting maxAspectRatio"