WIP: Surface state restoration support

Merge request reports

Loading