Merge "Improve DisconnectCause API for mainline." into main