Merge "Revert "Update styling of NLS dialog""