Merge "Move CallState and rename PRE_DIAL_WAIT."