Merge "Fix for 2585858, load invalid urls." into froyo