Merge "Do not invalidate drawable if tint doesn't change" into nyc-dev