Merge "Add a minimum height of 64dp for AlertDialog content" into jb-mr1-dev