Merge "Maintain call time across SRVCC (3/3)." into mnc-dev