Merge "Fix few issues in virtual camera service:" into main