Merge "Fix backwards-compat tinting for compound drawables" into nyc-support-24.1-dev