Merge "IMS-VT: Fix surface issue when InCallActivity is not destroyed." into atel.lnx.2.0-dev