Merge "IMS: Conference fixes" into mnc-dev