Merge "Fix an issue where the overflow wouldn't show if the flag was disabled" into main