Merge "Do not create intents for application/xhtml+xml" into froyo