[cm6+rt] Reduce flickering of rendered figure GitOrigin-RevId: a88845621228fa3a78ced023d5b5480ed600256a