Merge changes Id9534a59,I3ee81536

* changes:
  init: run property service in a thread
  Revert "init: Handle properties in the background of calling fs_mgr"