Merge "Fix button text color, reduce alert dialog padding" into lmp-dev