52117c6f62
Move saved state to ResourceArea, merge most of marks into shared helper. Reviewed-by: stuefe, iklam, tschatzl, xliu, vlivanov