Merge "Prevent dream starting on top of edit mode" into main