Merge "Do not create property_watch_loop thread for zygote"