Merge "Add GLES specific setting for layers"