Merge "Separate spot and ambient shadow strength setting"