Merge "Fix issue #3225529: AlertDialogs are squishing their content views"