Merge "Fix AlertDialog button style" into lmp-mr1-ub-dev