Merge "Fix event collection in SensorsVtsEnvironmentBase.h" into udc-dev