Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo