Merge "Fix defStyleRes fallback in obtainStyledAttributes"