Merge "Fix bug 5142716 - Dialog content font size/padding is inconsistent across different applications."