Merge "Move long-running calls to async with listeners."