Merge changes Ib8a4835c,I2e11b782

* changes:
  Revert "init: handle property service callbacks asynchronously"
  Revert "Stop & Resume property service when switching to bootstrap namespace"