Merge "Discard on-going steps for domain selection on local hangup"