Merge "Avoid shader string copy when possible." into devel/master