Merge "Flag the tint optimization so that we can run other tests with it re-enabled" into main