Merge "Always log new user state to event log" into oc-dev