Improve position restoration on stage/unstage

Previous way of restoring position was
- broken due to recent changes
- imprecise anyways

Restoring by top visible block is a lot more precise