Merge "Split ZenMode.getIcon() into getIconKey() and ZenIconLoader.getIcon()" into main