Merge "Skip forwarding launcher intents"