Merge "Fix the size of DialogWhenLarge windows"