Merge "Refactor vfc-ztevnfmdriver views"