Merge "Use activity dimensions instead of display to calculate dialog size."