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

* commit '003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
  Fix issue #5614559: Registering surface error in...