Merge "[Dev option] When toggle override matches its default state, don't override flags" into main