Merge "Change the bug associated with the tint optimization flag" into main