Merge "Rename callDrawGLFunction" into lmp-mr1-dev