Fix state restore when not editing
Merge remote-tracking branch 'origin/experimental' into experimental