Merge "Making UserCache the source of truth for all user events" into udc-qpr-dev