Merge "Update title on create/save dialog" into main