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