Bug 1090385 - More robust handling of external intents. r=snorp, a=sledru