Merge "Fix SysUI dialog width"