Merge "IMS: merge option not shown after srvcc" into mnc-dev