Merge "Revert "Restrict "javascript" and "file" scheme intents""