Merge "Remove extra padding from alert dialog layouts in -xlarge" into jb-mr1-dev