It was "settled" in that we're all agreed it's obviously incredibly stupid but not worth fighting over and getting called racist.

The good news is that "master vs mainline" was so embarrassing that even the people who push this stuff realized they overreached and have settled down since.