Modified shape indicator shaders to properly work with the new overlay stage.
Merge remote-tracking branch 'origin/feature/overlay' into develop