Merge "Use a separate icon factory for app badge icons"