am c424bc0e: am d60801f7: am a6af5fc1: Merge "Fix layout margins for Preferences in dialogs" into jb-mr1-dev

* commit 'c424bc0ed721c74d9a9db83c0e208818a6ccccc0':
  Fix layout margins for Preferences in dialogs