Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE