Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev