Merge "Correct issues with post-SRVCC conference." into sc-qpr1-dev