Merge "Fix build error" into video-userspace.lnx.5.0