[ros-diffs] [gschneider] 42745: Handle failure of EngLockSurface as well