Merge "IMS: SRVCC related fixes." into lmp-mr1-dev