Merge "Add an "icon key" to ZenMode" into main