Merge "Fix name editor data loss on rotation"