Merge "Avoid infinite loop in AppCompatDrawableManager" into nyc-dev