Merge "Adds secondary icons and intents to entries if they exist" into lmp-dev