Merge "Clean-up the STL demo shade implementation (2/2)" into main