Merge "Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call." into gingerbread