Merge "Fix ColorStateList bug."