Merge "Revert "Define video-call-app config option"" into sc-dev