Merge "Reduce unnecessary sync redraw without changes" into main