Merge "Remove blend mode change when mixColor is changed" into devel/master