Improve uncertainty surface rendering

This fixes a few issues with the uncertainty surface painter in
order to improve the rendering.

Change-Id: I7800463428a9517c4122ae5e50b4557dc3deb996
Merge topic 'improve-uncertainty-surface' into next

6eb206a Improve uncertainty surface rendering