Merge "Revert "init: run property service in a thread""