Merge "Remove CallState and rename PRE_DIAL_WAIT"