Merge "Do not create property_watch_loop thread for zygote" into qt-dev
am: 5c1ad00d4b

Change-Id: Idb1e40982b8aa0edd6e6f40b4f53d1793a6a8efb