Merge "Move GLES20DisplayList functionality into DisplayList"