Merge "Fix layout margins for Preferences in dialogs" into jb-mr1-dev