am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1

* commit '003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
  Fix issue #5614559: Registering surface error in...
tree: 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE