Merge "No frame and margins for dialog style preference screens."