Merge "Use correct state list for obtaining stroke color"