Merge "Clean UserEventLogger (1/2)" into udc-qpr-dev