Merge changes Ic5f78244,Ie84e6441 into main

* changes:
  Move global settings lookup off main thread
  Use dev option to disable notification protections