Merge "Add support for larger aspect ratio"