Merge "Don't crash when making a layer larger than supported dimensions Bug #8437401" into jb-mr2-dev