Merge "Reland^2: "init: run property service in a thread""