Merge "Redraw if dirty during stopped when resumed" into nyc-dev