Merge "Fix multi-toggle flicker bug" into main