Merge "Revert "Revert "Update styling of NLS dialog"""