Callkit branch: fix merge conflict
Callkit branch: fix merge conflict

vector-im/riot-ios,vector-im/riot-ios,vector-im/riot-ios,vector-im/riot-ios,vector-im/riot-ios,vector-im/vector-ios,vector-im/vector-ios,vector-im/vector-ios,vector-im/riot-ios