Merge "Further shader optimizations" into sc-dev