Retain editor position when going back from the preview

After clicking "Keep editing"

Bug: 51209
Change-Id: Id5dde34d186c53f1f297905886aa63db94eed228
Merge "Retain editor position when going back from the preview"