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