Merge "Do not return synthetic launcher activity for completely headless apps"