Merge "Revert incorrect NonNull assertions in ColorStateList loading"