Merge "CmHandleState transition using state handler"