Merge "Reduce unnecessary redraw for non blast sync"