Merge "Make SysUI dialogs more consistent"