Merge "Fix StrictMode violation in WebsiteSettingsActivity"