Merge "IMS SRVCC handling and call log cleanup." into lmp-mr1-dev