Merge "IMS call merge call-back changes." into lmp-mr1-dev