Merge "Fixing unhold in CallsManager so it does not hold child calls." into lmp-mr1-dev