Merge "getColorStateList should apply theme overlays"