Merge "Fix Material-themed alert dialog sizing"