Merge "Apply correct tinting info on image source" into nyc-support-25.4-dev