Merge "Fix stroke color in GradientState.initializeWithState()"