Merge "Merge ZenMode.canEditName() and canEditIcon()" into main