Merge "Opt adbd and init out of property-watcher thread"