Merge "Revert "Suppress injected launcher activity for apps that are vouched""