Fix Settings breakage with antiTracking variable short circuit, fix o… …
…ccasional bug with unwhitelisting
