Merge "Fix AlertDialog size when Activity is a Dialog" into lmp-mr1-ub-dev