Merge "Current page not updated when closed" into lmp-preview-dev