Merge "Fix bug 5214224 - Align stock framework list item padding for dialogs"