Merge "Make fixed-width dialogs larger on sw600dp." into jb-dev