Merge "Update styling of NLS dialog"