Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev